Blindly throw a conditional check in here, just in case the unhandled…

… exception is the only bad thing going on here.
airbreather · Jan 8, 2025 · f8e6d6e · f8e6d6e
1 parent 76440df
commit f8e6d6e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Autopelago/Game.RouteCalculator.cs b/src/Autopelago/Game.RouteCalculator.cs
@@ -17,7 +17,13 @@ private bool UpdateTargetLocation()
         _pathToTarget.Clear();
         bool first = true;
         GetPath(CurrentLocation, TargetLocation);
-        _pathToTarget.EnsureCapacity(_prevPath.Count - 1);
+
+        // consider: why is this sometimes empty immediately after calling GetPath???
+        if (_prevPath.Count > 0)
+        {
+            _pathToTarget.EnsureCapacity(_prevPath.Count - 1);
+        }
+
         foreach (LocationKey l in _prevPath)
         {
             if (first)

diff --git a/src/Autopelago/Game.cs b/src/Autopelago/Game.cs
@@ -530,12 +530,12 @@ public void Advance()
                 // combat this, every time the player decides to move, they can advance up to three
                 // whole spaces towards their target. this keeps the overall progression speed the
                 // same in dense areas.
-                for (int i = 0; i < MaxMovementsPerAction && CurrentLocation != TargetLocation; i++)
+                for (int i = 0; i < MaxMovementsPerAction && CurrentLocation != TargetLocation && _pathToTarget.TryDequeue(out LocationKey dequeued); i++)
                 {
                     _movementLog.Add(new()
                     {
                         PreviousLocation = CurrentLocation,
-                        CurrentLocation = _pathToTarget.Dequeue(),
+                        CurrentLocation = dequeued,
                     });
 
                     CurrentLocation = _movementLog[^1].CurrentLocation;