ActionBlocker CanPickup uses EntityUid exclusively

2021-11-09 13:43:39 +01:00
parent b82cb38bf9
commit 9921801f15
11 changed files with 17 additions and 23 deletions
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -75,18 +75,12 @@ namespace Content.Shared.ActionBlocker
            return !ev.Cancelled;
        }

-        public bool CanPickup(IEntity entity)
-        {
-            var ev = new PickupAttemptEvent(entity);
-
-            RaiseLocalEvent(entity.Uid, ev);
-
-            return !ev.Cancelled;
-        }
-
        public bool CanPickup(EntityUid uid)
        {
-            return CanPickup(EntityManager.GetEntity(uid));
+            var ev = new PickupAttemptEvent(uid);
+            RaiseLocalEvent(uid, ev);
+
+            return !ev.Cancelled;
        }

        public bool CanEmote(EntityUid uid)