From 23cfab600113f367855deb81c3333f40a3e15fd2 Mon Sep 17 00:00:00 2001 From: r3versi Date: Sat, 4 Jan 2020 20:08:23 +0100 Subject: [PATCH] Stop Exploration sets unit.action to null (#1613) * Stop Exploration sets unit.action to null * UnitActions callback Fix #1614 --- .../unciv/ui/worldscreen/unit/UnitActions.kt | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt index 3ad884fc48..8b5af7dab5 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt @@ -25,7 +25,11 @@ class UnitActions { val actionList = ArrayList() if (unit.action != null && unit.action!!.startsWith("moveTo")) { - actionList += UnitAction(name = "Stop movement", canAct = true) + actionList += UnitAction( + name = "Stop movement", + canAct = true, + action = { unit.action = null } + ) } val workingOnImprovement = unit.hasUnique("Can build improvements on tiles") && unit.currentTile.hasImprovementInProgress() @@ -70,7 +74,11 @@ class UnitActions { unit.action = Constants.unitActionExplore }) } else { - actionList += UnitAction(name = "Stop exploration", canAct = true) + actionList += UnitAction( + name = "Stop exploration", + canAct = true, + action = { unit.action = null } + ) } } @@ -167,7 +175,11 @@ class UnitActions { }) if (Constants.unitActionAutomation == unit.action) { - actionList += UnitAction(name = "Stop automation", canAct = true) + actionList += UnitAction( + name = "Stop automation", + canAct = true, + action = { unit.action = null } + ) } else { actionList += UnitAction( name = "Automate",