Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

21
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs
View File

@@ -32,24 +32,19 @@ public partial class SharedGunSystem
private bool TryGetClothingSlotEntity(EntityUid uid, ClothingSlotAmmoProviderComponent component, [NotNullWhen(true)] out EntityUid? slotEntity)
{
slotEntity = null;
if (!Containers.TryGetContainingContainer(uid, out var container))
return false;
var user = container.Owner;
if (!TryComp<InventoryComponent>(user, out var inventory))
if (!_inventory.TryGetContainerSlotEnumerator(uid, out var enumerator, component.TargetSlot))
return false;
var slots = _inventory.GetSlots(user, inventory);
foreach (var slot in slots)
while (enumerator.NextItem(out var item))
{
if (slot.SlotFlags != component.TargetSlot)
if (component.ProviderWhitelist == null || component.ProviderWhitelist.IsValid(item, EntityManager))
continue;
if (!_inventory.TryGetSlotEntity(user, slot.Name, out var e, inventory))
continue;
if (component.ProviderWhitelist != null && !component.ProviderWhitelist.IsValid(e.Value, EntityManager))
continue;
slotEntity = e;
slotEntity = item;
return true;
}
return slotEntity != null;
return false;
}
}