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

Add public methods to relay inventory events (#22165)

Browse Source
This commit is contained in:
DrSmugleaf
2023-12-06 00:01:31 -07:00
committed by GitHub
parent 89295d97b6
commit abfea8db5f
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Shared/Inventory/InventorySystem.Relay.cs
View File

@@ -49,14 +49,26 @@ public partial class InventorySystem
protected void RefRelayInventoryEvent<T>(EntityUid uid, InventoryComponent component, ref T args) where T : IInventoryRelayEvent protected void RefRelayInventoryEvent<T>(EntityUid uid, InventoryComponent component, ref T args) where T : IInventoryRelayEvent
{ {
var containerEnumerator = new ContainerSlotEnumerator(uid, component.TemplateId, _prototypeManager, this, args.TargetSlots); RelayEvent((uid, component), args);
}
// this copies the by-ref event protected void RelayInventoryEvent<T>(EntityUid uid, InventoryComponent component, T args) where T : IInventoryRelayEvent
{
RelayEvent((uid, component), args);
}
public void RelayEvent<T>(Entity<InventoryComponent> inventory, ref T args) where T : IInventoryRelayEvent
{
var containerEnumerator = new ContainerSlotEnumerator(inventory, inventory.Comp.TemplateId, _prototypeManager, this, args.TargetSlots);
// this copies the by-ref event if it is a struct
var ev = new InventoryRelayedEvent<T>(args); var ev = new InventoryRelayedEvent<T>(args);
while (containerEnumerator.MoveNext(out var container)) while (containerEnumerator.MoveNext(out var container))
{ {
if (!container.ContainedEntity.HasValue) continue; if (!container.ContainedEntity.HasValue)
continue;
RaiseLocalEvent(container.ContainedEntity.Value, ev); RaiseLocalEvent(container.ContainedEntity.Value, ev);
} }
@@ -64,16 +76,18 @@ public partial class InventorySystem
args = ev.Args; args = ev.Args;
} }
protected void RelayInventoryEvent<T>(EntityUid uid, InventoryComponent component, T args) where T : IInventoryRelayEvent public void RelayEvent<T>(Entity<InventoryComponent> inventory, T args) where T : IInventoryRelayEvent
{ {
if (args.TargetSlots == SlotFlags.NONE) if (args.TargetSlots == SlotFlags.NONE)
return; return;
var containerEnumerator = new ContainerSlotEnumerator(uid, component.TemplateId, _prototypeManager, this, args.TargetSlots); var containerEnumerator = new ContainerSlotEnumerator(inventory, inventory.Comp.TemplateId, _prototypeManager, this, args.TargetSlots);
var ev = new InventoryRelayedEvent<T>(args); var ev = new InventoryRelayedEvent<T>(args);
while (containerEnumerator.MoveNext(out var container)) while (containerEnumerator.MoveNext(out var container))
{ {
if (!container.ContainedEntity.HasValue) continue; if (!container.ContainedEntity.HasValue)
continue;
RaiseLocalEvent(container.ContainedEntity.Value, ev); RaiseLocalEvent(container.ContainedEntity.Value, ev);
} }
} }