More #12522 edge case

yairm210 · Nov 26, 2024 · 7fbdfd1 · 7fbdfd1
1 parent 72329ae
commit 7fbdfd1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt b/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt
@@ -333,7 +333,8 @@ object UnitAutomation {
                 }
                 if (unit.movement.canUnitSwapTo(retreatTile)) {
                     unit.movement.headTowards(retreatTile) // we need to move through the intermediate tiles
-                    if (unit.currentTile.neighbors.contains(otherUnit.currentTile)) {
+                    // if nothing changed
+                    if (unit.currentTile.neighbors.contains(otherUnit.currentTile) && unit.movement.canUnitSwapTo(retreatTile)) {
                         unit.movement.swapMoveToTile(retreatTile)
                     }
                     return true