ActionBlocker CanChangeDirection uses EntityUid exclusively

Author: gradientvera

Content.IntegrationTests/Tests/Buckle/BuckleTest.cs

@@ -83,7 +83,7 @@ await server.WaitAssertion(() =>
                 Assert.Null(buckle.BuckledTo);
                 Assert.False(buckle.Buckled);
                 Assert.True(actionBlocker.CanMove(human.Uid));
-                Assert.True(actionBlocker.CanChangeDirection(human));
+                Assert.True(actionBlocker.CanChangeDirection(human.Uid));
                 Assert.True(standingState.Down(human.Uid));
                 Assert.True(standingState.Stand(human.Uid));
 
@@ -101,7 +101,7 @@ await server.WaitAssertion(() =>
                 var player = IoCManager.Resolve<IPlayerManager>().GetAllPlayers().Single();
                 Assert.True(((BuckleComponentState) buckle.GetComponentState(player)).Buckled);
                 Assert.False(actionBlocker.CanMove(human.Uid));
-                Assert.False(actionBlocker.CanChangeDirection(human));
+                Assert.False(actionBlocker.CanChangeDirection(human.Uid));
                 Assert.False(standingState.Down(human.Uid));
                 Assert.That((human.Transform.WorldPosition - chair.Transform.WorldPosition).Length, Is.LessThanOrEqualTo(buckle.BuckleOffset.Length));
 
@@ -135,7 +135,7 @@ await server.WaitAssertion(() =>
                 Assert.Null(buckle.BuckledTo);
                 Assert.False(buckle.Buckled);
                 Assert.True(actionBlocker.CanMove(human.Uid));
-                Assert.True(actionBlocker.CanChangeDirection(human));
+                Assert.True(actionBlocker.CanChangeDirection(human.Uid));
                 Assert.True(standingState.Down(human.Uid));
 
                 // Unbuckle, strap
@@ -193,7 +193,7 @@ await server.WaitAssertion(() =>
                 Assert.True(buckle.TryUnbuckle(human, true));
                 Assert.False(buckle.Buckled);
                 Assert.True(actionBlocker.CanMove(human.Uid));
-                Assert.True(actionBlocker.CanChangeDirection(human));
+                Assert.True(actionBlocker.CanChangeDirection(human.Uid));
                 Assert.True(standingState.Down(human.Uid));
 
                 // Re-buckle

Content.Shared/ActionBlocker/ActionBlockerSystem.cs

@@ -115,20 +115,14 @@ public bool CanUnequip(EntityUid uid)
             return !ev.Cancelled;
         }
 
-        public bool CanChangeDirection(IEntity entity)
+        public bool CanChangeDirection(EntityUid uid)
         {
-            var ev = new ChangeDirectionAttemptEvent(entity);
-
-            RaiseLocalEvent(entity.Uid, ev);
+            var ev = new ChangeDirectionAttemptEvent(uid);
+            RaiseLocalEvent(uid, ev);
 
             return !ev.Cancelled;
         }
 
-        public bool CanChangeDirection(EntityUid uid)
-        {
-            return CanChangeDirection(EntityManager.GetEntity(uid));
-        }
-
         public bool CanShiver(IEntity entity)
         {
             var ev = new ShiverAttemptEvent(entity);

Content.Shared/Interaction/Events/ChangeDirectionAttemptEvent.cs

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

Content.Shared/Interaction/RotateToFaceSystem.cs

@@ -45,7 +45,7 @@ public bool TryFaceCoordinates(IEntity user, Vector2 coordinates)
 
         public bool TryFaceAngle(IEntity user, Angle diffAngle)
         {
-            if (_actionBlockerSystem.CanChangeDirection(user))
+            if (_actionBlockerSystem.CanChangeDirection(user.Uid))
             {
                 user.Transform.WorldRotation = diffAngle;
                 return true;