ActionBlocker CanEquip uses EntityUid exclusively

2021-11-09 13:45:21 +01:00
parent 9921801f15
commit a69387d741
3 changed files with 8 additions and 14 deletions
--- 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)