Add zero length direction check

rbertoche · Oct 18, 2023 · 251d1da · 251d1da
1 parent 506cef1
commit 251d1da
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -253,15 +253,23 @@ private void Climb(EntityUid uid, EntityUid user, EntityUid climbable, bool sile
          var (worldPos, worldRot) = _xformSystem.GetWorldPositionRotation(xform);
          var worldDirection = _xformSystem.GetWorldPosition(climbable) - worldPos;
          var distance = worldDirection.Length();
-         var parentRot = (worldRot - xform.LocalRotation);
-         // Need direction relative to climber's parent.
-         var localDirection = (-parentRot).RotateVec(worldDirection);
 
          climbing.IsClimbing = true;
          var climbDuration = TimeSpan.FromSeconds(distance / climbing.TransitionRate);
          climbing.NextTransition = _timing.CurTime + climbDuration;
 
-         climbing.Direction = localDirection.Normalized() * climbing.TransitionRate;
+        if (distance > 0)
+        {
+            var parentRot = (worldRot - xform.LocalRotation);
+            // Need direction relative to climber's parent.
+            var localDirection = (-parentRot).RotateVec(worldDirection);
+            climbing.Direction = localDirection.Normalized() * climbing.TransitionRate;
+        }
+        else
+        {
+            climbing.Direction = Vector2.Zero;
+        }
+
          Dirty(uid, climbing);
 
          _audio.PlayPredicted(comp.FinishClimbSound, climbable, user);