From dbf48ac7bf09d75f637a5672f5fb37cbb8ba7282 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Mon, 11 Mar 2019 23:07:04 +0800 Subject: [PATCH 1/2] Fix bombard crash. --- core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt b/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt index 572a944764..ebf697688d 100644 --- a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt +++ b/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt @@ -144,6 +144,9 @@ class BattleTable(val worldScreen: WorldScreen): Table() { else if (attacker is CityCombatant) { canAttack = UnitAutomation().getBombardTargets(attacker.city).contains(defender.getTile()) + if (canAttack) { + attackableEnemy = AttackableTile(attacker.getTile(), defender.getTile()) + } } } @@ -191,4 +194,4 @@ class BattleTable(val worldScreen: WorldScreen): Table() { return healthBar } -} \ No newline at end of file +} From 1a5862d6b1bfcadf44fcf7a65cbbe4edb7b33958 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Mon, 11 Mar 2019 23:19:40 +0800 Subject: [PATCH 2/2] Fix build error... --- core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt b/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt index ebf697688d..b4dd828c50 100644 --- a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt +++ b/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt @@ -145,7 +145,7 @@ class BattleTable(val worldScreen: WorldScreen): Table() { { canAttack = UnitAutomation().getBombardTargets(attacker.city).contains(defender.getTile()) if (canAttack) { - attackableEnemy = AttackableTile(attacker.getTile(), defender.getTile()) + attackableEnemy = UnitAutomation.AttackableTile(attacker.getTile(), defender.getTile()) } } }