ActionBlocker CanInteract uses EntityUid exclusively

ActionBlockerSystem fully uses EntityUid now!

Content.Shared/ActionBlocker/ActionBlockerSystem.cs

@@ -18,9 +18,6 @@ namespace Content.Shared.ActionBlocker
     [UsedImplicitly]
     public class ActionBlockerSystem : EntitySystem
     {
-        // TODO: Make the EntityUid the main overload for all these methods.
-        // TODO: Move each of these to their relevant EntitySystems?
-
         public bool CanMove(EntityUid uid)
         {
             var ev = new MovementAttemptEvent(uid);
@@ -29,18 +26,12 @@ namespace Content.Shared.ActionBlocker
             return !ev.Cancelled;
         }
 
-        public bool CanInteract(IEntity entity)
-        {
-            var ev = new InteractionAttemptEvent(entity);
-
-            RaiseLocalEvent(entity.Uid, ev);
-
-            return !ev.Cancelled;
-        }
-
         public bool CanInteract(EntityUid uid)
         {
-            return CanInteract(EntityManager.GetEntity(uid));
+            var ev = new InteractionAttemptEvent(uid);
+            RaiseLocalEvent(uid, ev);
+
+            return !ev.Cancelled;
         }
 
         public bool CanUse(EntityUid uid)

Content.Shared/Interaction/Events/InteractionAttemptEvent.cs

@@ -4,11 +4,11 @@ namespace Content.Shared.Interaction.Events
 {
     public class InteractionAttemptEvent : CancellableEntityEventArgs
     {
-        public InteractionAttemptEvent(IEntity entity)
+        public InteractionAttemptEvent(EntityUid uid)
         {
-            Entity = entity;
+            Uid = uid;
         }
 
-        public IEntity Entity { get; }
+        public EntityUid Uid { get; }
     }
 }

Content.Shared/Interaction/SharedInteractionSystem.cs

@@ -373,7 +373,7 @@ namespace Content.Shared.Interaction
         /// </summary>
         public async Task InteractUsing(IEntity user, IEntity used, IEntity target, EntityCoordinates clickLocation)
         {
-            if (!_actionBlockerSystem.CanInteract(user))
+            if (!_actionBlockerSystem.CanInteract(user.Uid))
                 return;
 
             if (InteractDoBefore(user, used, target, clickLocation, true))
@@ -444,7 +444,7 @@ namespace Content.Shared.Interaction
                 delayComponent.BeginDelay();
             }
 
-            if (!_actionBlockerSystem.CanInteract(user) || !_actionBlockerSystem.CanUse(user.Uid))
+            if (!_actionBlockerSystem.CanInteract(user.Uid) || !_actionBlockerSystem.CanUse(user.Uid))
                 return;
 
             // all activates should only fire when in range / unobstructed

Content.Shared/Storage/SharedStorageComponent.cs

@@ -34,7 +34,7 @@ namespace Content.Shared.Storage
 
         bool IDraggable.Drop(DragDropEvent eventArgs)
         {
-            if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(eventArgs.User))
+            if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(eventArgs.User.Uid))
             {
                 return false;
             }

Content.Shared/Strip/Components/SharedStrippableComponent.cs

@@ -17,7 +17,7 @@ namespace Content.Shared.Strip.Components
         {
             return by != Owner
                    && by.HasComponent<SharedHandsComponent>()
-                   && EntitySystem.Get<ActionBlockerSystem>().CanInteract(by);
+                   && EntitySystem.Get<ActionBlockerSystem>().CanInteract(by.Uid);
         }
 
         bool IDraggable.CanDrop(CanDropEvent args)

Content.Shared/Verbs/VerbEvents.cs

@@ -182,7 +182,7 @@ namespace Content.Shared.Verbs
             // A large number of verbs need to check action blockers. Instead of repeatedly having each system individually
             // call ActionBlocker checks, just cache it for the verb request.
             var actionBlockerSystem = EntitySystem.Get<ActionBlockerSystem>();
-            CanInteract = force || actionBlockerSystem.CanInteract(user);
+            CanInteract = force || actionBlockerSystem.CanInteract(user.Uid);
 
             if (!user.TryGetComponent(out Hands) ||
                 !actionBlockerSystem.CanUse(user.Uid))