tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove 700 usages of Component.Owner (#21100)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-19 12:34:31 -07:00
committed by GitHub
parent 5825ffb95c
commit f560f88eb5
261 changed files with 2291 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/Storage/EntitySystems/CursedEntityStorageSystem.cs
View File

@@ -1,10 +1,10 @@
using System.Linq;
using Content.Server.Storage.Components;
using Content.Shared.Audio;
using Content.Shared.Storage.Components;
using Robust.Shared.Audio;
using Robust.Shared.Player;
using Robust.Shared.Random;
using System.Linq;
using Content.Shared.Storage.Components;
namespace Content.Server.Storage.EntitySystems;
@@ -28,13 +28,19 @@ public sealed class CursedEntityStorageSystem : EntitySystem
if (storage.Open || storage.Contents.ContainedEntities.Count <= 0)
return;
var lockerQuery = EntityQuery<EntityStorageComponent>().ToList();
lockerQuery.Remove(storage);
var lockers = new List<Entity<EntityStorageComponent>>();
var query = EntityQueryEnumerator<EntityStorageComponent>();
while (query.MoveNext(out var storageUid, out var storageComp))
{
lockers.Add((storageUid, storageComp));
}
if (lockerQuery.Count == 0)
lockers.RemoveAll(e => e.Owner == uid);
if (lockers.Count == 0)
return;
var lockerEnt = _random.Pick(lockerQuery).Owner;
var lockerEnt = _random.Pick(lockers).Owner;
foreach (var entity in storage.Contents.ContainedEntities.ToArray())
{