diff --git a/Content.Server/Inventory/Components/InventoryComponent.cs b/Content.Server/Inventory/Components/InventoryComponent.cs index 37c8a90ef6..8f62ae13a5 100644 --- a/Content.Server/Inventory/Components/InventoryComponent.cs +++ b/Content.Server/Inventory/Components/InventoryComponent.cs @@ -207,7 +207,7 @@ namespace Content.Server.Inventory.Components var pass = false; reason = null; - if (mobCheck && !EntitySystem.Get().CanEquip(Owner)) + if (mobCheck && !EntitySystem.Get().CanEquip(OwnerUid)) { reason = Loc.GetString("inventory-component-can-equip-cannot"); return false; diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs index c32172dadf..e877b17e1d 100644 --- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs +++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs @@ -99,18 +99,12 @@ namespace Content.Shared.ActionBlocker return !ev.Cancelled; } - public bool CanEquip(IEntity entity) - { - var ev = new EquipAttemptEvent(entity); - - RaiseLocalEvent(entity.Uid, ev); - - return !ev.Cancelled; - } - public bool CanEquip(EntityUid uid) { - return CanEquip(EntityManager.GetEntity(uid)); + var ev = new EquipAttemptEvent(uid); + RaiseLocalEvent(uid, ev); + + return !ev.Cancelled; } public bool CanUnequip(IEntity entity) diff --git a/Content.Shared/Inventory/Events/EquipAttemptEvent.cs b/Content.Shared/Inventory/Events/EquipAttemptEvent.cs index 4715489c26..6f10ce2a90 100644 --- a/Content.Shared/Inventory/Events/EquipAttemptEvent.cs +++ b/Content.Shared/Inventory/Events/EquipAttemptEvent.cs @@ -4,11 +4,11 @@ namespace Content.Shared.Inventory.Events { public class EquipAttemptEvent : CancellableEntityEventArgs { - public EquipAttemptEvent(IEntity entity) + public EquipAttemptEvent(EntityUid uid) { - Entity = entity; + Uid = uid; } - public IEntity Entity { get; } + public EntityUid Uid { get; } } }