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

Inventory slot enumerator rejig (#21788)

Browse Source
This commit is contained in:
Leon Friedrich
2023-12-07 16:20:51 -05:00
committed by GitHub
parent 445c474c2c
commit 287d22cc49
18 changed files with 238 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
View File

@@ -42,26 +42,26 @@ public sealed class MagnetPickupSystem : EntitySystem
public override void Update(float frameTime)
{
base.Update(frameTime);
var query = EntityQueryEnumerator<MagnetPickupComponent, StorageComponent, TransformComponent>();
var query = EntityQueryEnumerator<MagnetPickupComponent, StorageComponent, TransformComponent, MetaDataComponent>();
var currentTime = _timing.CurTime;
while (query.MoveNext(out var uid, out var comp, out var storage, out var xform))
while (query.MoveNext(out var uid, out var comp, out var storage, out var xform, out var meta))
{
if (comp.NextScan > currentTime)
continue;
comp.NextScan += ScanDelay;
// No space
if (!_storage.HasSpace((uid, storage)))
continue;
if (!_inventory.TryGetContainingSlot(uid, out var slotDef))
if (!_inventory.TryGetContainingSlot((uid, xform, meta), out var slotDef))
continue;
if ((slotDef.SlotFlags & comp.SlotFlags) == 0x0)
continue;
// No space
if (!_storage.HasSpace((uid, storage)))
continue;
var parentUid = xform.ParentUid;
var playedSound = false;
var finalCoords = xform.Coordinates;