Handle end of the path

OpenDreamProject · Feb 6, 2025 · 0608575 · 0608575
1 parent 58131db
commit 0608575
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/OpenDreamRuntime/WalkManager.cs b/OpenDreamRuntime/WalkManager.cs
@@ -135,9 +135,12 @@ public void StartWalkTo(DreamObjectMovable movable, DreamObjectAtom target, int
                 var currentLoc = _atomManager.GetAtomPosition(movable);
                 var targetLoc = _atomManager.GetAtomPosition(target);
                 var steps = _dreamMapManager.CalculateSteps(currentLoc, targetLoc, min);
-                var dir = steps.First();
+                using var enumerator = steps.GetEnumerator();
+                if (!enumerator.MoveNext()) // No more steps to take
+                    break;
 
-                DreamObjectTurf? newLoc = DreamProcNativeHelpers.GetStep(_atomManager, _dreamMapManager, movable, dir);
+                var dir = enumerator.Current;
+                var newLoc = DreamProcNativeHelpers.GetStep(_atomManager, _dreamMapManager, movable, dir);
                 await state.Call(moveProc, movable, null, new(newLoc), new((int)dir));
             }