ActionBlocker CanThrow uses EntityUid exclusively

2021-11-09 13:20:55 +01:00
parent c051b1e056
commit c68c3219f8
3 changed files with 9 additions and 14 deletions
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -51,18 +51,13 @@ namespace Content.Shared.ActionBlocker
            return !ev.Cancelled;
        }

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

        public bool CanSpeak(IEntity entity)