From 37d808936a46b2202e9240ec3025175d1741bb4e Mon Sep 17 00:00:00 2001 From: itanasi <44038014+itanasi@users.noreply.github.com> Date: Mon, 28 Nov 2022 06:11:26 -0800 Subject: [PATCH] Fix Repair Crash (#8065) * Add Hammer Icon to Repair Civilopedia Entry * Fix crash from logic bug in getRepairTurns --- android/Images/ImprovementIcons/Repair.png | Bin 0 -> 5494 bytes .../com/unciv/ui/worldscreen/unit/UnitActions.kt | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 android/Images/ImprovementIcons/Repair.png diff --git a/android/Images/ImprovementIcons/Repair.png b/android/Images/ImprovementIcons/Repair.png new file mode 100644 index 0000000000000000000000000000000000000000..b30169b033958a7195fb0b9a1a85936c070c628a GIT binary patch literal 5494 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 literal 0 HcmV?d00001 diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt index 343af6ba53..7460f28ac2 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt @@ -503,7 +503,7 @@ object UnitActions { if (tile.improvementInProgress == Constants.repair) return tile.turnsToImprovement var repairTurns = tile.ruleset.tileImprovements[Constants.repair]!!.getTurnsToBuild(unit.civInfo, unit) - val pillagedImprovement = tile.getImprovementToPillage()!! + val pillagedImprovement = tile.getImprovementToRepair()!! val turnsToBuild = pillagedImprovement.getTurnsToBuild(unit.civInfo, unit) // cap repair to number of turns to build original improvement if (turnsToBuild < repairTurns) repairTurns = turnsToBuild