Move Until Healed wake up to startTurn so Fortify lasts until start o…

…f turn (#12786)
yairm210 · Jan 11, 2025 · 534850f · 534850f
1 parent a3b48ab
commit 534850f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/core/src/com/unciv/logic/map/mapunit/UnitTurnManager.kt b/core/src/com/unciv/logic/map/mapunit/UnitTurnManager.kt
@@ -35,11 +35,6 @@ class UnitTurnManager(val unit: MapUnit) {
         if (!unit.hasUnitMovedThisTurn() || unit.hasUnique(UniqueType.HealsEvenAfterAction))
             healUnit()
 
-        if (unit.action != null && unit.health > 99)
-            if (unit.isActionUntilHealed()) {
-                unit.action = null // wake up when healed
-            }
-
         if (unit.isPreparingParadrop() || unit.isPreparingAirSweep())
             unit.action = null
 
@@ -157,6 +152,11 @@ class UnitTurnManager(val unit: MapUnit) {
                 }
         )  unit.action = null
 
+        if (unit.action != null && unit.health > 99)
+            if (unit.isActionUntilHealed()) {
+                unit.action = null // wake up when healed
+            }
+
         val tileOwner = unit.getTile().getOwner()
         if (tileOwner != null
                 && !unit.cache.canEnterForeignTerrain