diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs index 57fbd78b62..1b68b393f4 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs @@ -218,9 +218,6 @@ namespace Content.Shared.Containers.ItemSlots // ContainerSlot automatically raises a directed EntInsertedIntoContainerMessage _audioSystem.PlayPredicted(slot.InsertSound, uid, excludeUserAudio ? user : null); - - var ev = new ItemSlotChangedEvent(); - RaiseLocalEvent(uid, ref ev, true); } /// @@ -324,8 +321,6 @@ namespace Content.Shared.Containers.ItemSlots // ContainerSlot automatically raises a directed EntRemovedFromContainerMessage _audioSystem.PlayPredicted(slot.EjectSound, uid, excludeUserAudio ? user : null, slot.SoundOptions); - var ev = new ItemSlotChangedEvent(); - RaiseLocalEvent(uid, ref ev, true); } /// @@ -606,10 +601,4 @@ namespace Content.Shared.Containers.ItemSlots args.State = new ItemSlotsComponentState(component.Slots); } } - - /// - /// Raised directed on an entity when one of its item slots changes. - /// - [ByRefEvent] - public readonly struct ItemSlotChangedEvent {} } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs index 7d0b9bf8c3..d2adb3b4b2 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs @@ -18,7 +18,7 @@ public abstract partial class SharedGunSystem { SubscribeLocalEvent(OnChamberMagazineTakeAmmo); SubscribeLocalEvent>(OnMagazineVerb); - SubscribeLocalEvent(OnMagazineSlotChange); + SubscribeLocalEvent(OnMagazineSlotChange); SubscribeLocalEvent(OnMagazineUse); SubscribeLocalEvent(OnChamberMagazineExamine); } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs index aa742cd024..588f7bd2b7 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs @@ -17,7 +17,7 @@ public abstract partial class SharedGunSystem { SubscribeLocalEvent(OnMagazineTakeAmmo); SubscribeLocalEvent>(OnMagazineVerb); - SubscribeLocalEvent(OnMagazineSlotChange); + SubscribeLocalEvent(OnMagazineSlotChange); SubscribeLocalEvent(OnMagazineUse); SubscribeLocalEvent(OnMagazineExamine); } @@ -55,7 +55,7 @@ public abstract partial class SharedGunSystem } } - private void OnMagazineSlotChange(EntityUid uid, MagazineAmmoProviderComponent component, ref ItemSlotChangedEvent args) + private void OnMagazineSlotChange(EntityUid uid, MagazineAmmoProviderComponent component, EntInsertedIntoContainerMessage args) { UpdateAmmoCount(uid); if (!TryComp(uid, out var appearance))