From c05503bb862249380d66c740593532c58c102754 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Wed, 11 Jul 2018 21:31:59 +0300
Subject: [PATCH] Attacking with a unit disables its "move" command

---
 core/src/com/unciv/logic/battle/Battle.kt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt
index f6f3c8e0a8..f51834f94d 100644
--- a/core/src/com/unciv/logic/battle/Battle.kt
+++ b/core/src/com/unciv/logic/battle/Battle.kt
@@ -95,6 +95,9 @@ class Battle(val gameInfo:GameInfo=UnCivGame.Current.gameInfo) {
             if(attacker is MapUnitCombatant) attacker.unit.promotions.XP += 2
             if(defender is MapUnitCombatant) defender.unit.promotions.XP += 2
         }
+
+        if(attacker is MapUnitCombatant && attacker.unit.action!=null && attacker.unit.action!!.startsWith("moveTo"))
+            attacker.unit.action=null
     }
 
     private fun conquerCity(city: CityInfo, attacker: ICombatant) {