ActionBlocker CanSpeak uses EntityUid exclusively

2021-11-09 13:21:52 +01:00
parent c68c3219f8
commit 190612a350
4 changed files with 10 additions and 15 deletions
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -60,18 +60,13 @@ namespace Content.Shared.ActionBlocker
            return !ev.Cancelled;
        }

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

        public bool CanDrop(IEntity entity)