From 534850fd90b3e4ca0bd80c20501fb0c3d211f9dc Mon Sep 17 00:00:00 2001
From: itanasi <44038014+itanasi@users.noreply.github.com>
Date: Sat, 11 Jan 2025 09:56:42 -0800
Subject: [PATCH] Move Until Healed wake up to startTurn so Fortify lasts until
 start of turn (#12786)

---
 .../src/com/unciv/logic/map/mapunit/UnitTurnManager.kt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/com/unciv/logic/map/mapunit/UnitTurnManager.kt b/core/src/com/unciv/logic/map/mapunit/UnitTurnManager.kt
index edc3672aa26d9..aba059f75b855 100644
--- 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