From 1f654df9774f14485293b9aefbe72562ba8e1260 Mon Sep 17 00:00:00 2001
From: GlassEclipse <32942106+GlassEclipse@users.noreply.github.com>
Date: Sat, 21 Nov 2020 21:40:09 -0600
Subject: [PATCH] Fixes crit in nograv (#2554)

---
 .../GameObjects/EntitySystems/SharedMoverSystem.cs         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs
index 8d59168e75..974ba1014a 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs
+++ b/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs
@@ -49,7 +49,8 @@ namespace Content.Shared.GameObjects.EntitySystems
             base.Shutdown();
         }
 
-        protected void UpdateKinematics(ITransformComponent transform, IMoverComponent mover, IPhysicsComponent physics)
+        //TODO: reorganize this to make more logical sense
+        protected void UpdateKinematics(ITransformComponent transform, IMoverComponent mover, IPhysicsComponent physics) 
         {
             physics.EnsureController<MoverController>();
 
@@ -70,14 +71,14 @@ namespace Content.Shared.GameObjects.EntitySystems
             // TODO: movement check.
             var (walkDir, sprintDir) = mover.VelocityDir;
             var combined = walkDir + sprintDir;
-            if (combined.LengthSquared < 0.001 || !ActionBlockerSystem.CanMove(mover.Owner) && !weightless)
+            if (combined.LengthSquared < 0.001 || !ActionBlockerSystem.CanMove(mover.Owner) && !weightless) 
             {
                 if (physics.TryGetController(out MoverController controller))
                 {
                     controller.StopMoving();
                 }
             }
-            else
+            else if (ActionBlockerSystem.CanMove(mover.Owner))
             {
                 if (weightless)
                 {