mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-21 05:09:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

Modded "Remove" commands to nonexistant features no longer crashes the game

Browse Source
This commit is contained in:
Yair Morgenstern
2021-03-28 21:59:57 +03:00
parent 1f057831d8
commit 63e10dde71
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -411,12 +411,13 @@ class MapUnit {
if (tile.improvementInProgress == "Remove Road" || tile.improvementInProgress == "Remove Railroad") if (tile.improvementInProgress == "Remove Road" || tile.improvementInProgress == "Remove Railroad")
tile.roadStatus = RoadStatus.None tile.roadStatus = RoadStatus.None
else { else {
val removedFeature = tile.improvementInProgress!!.removePrefix("Remove ") val removedFeatureName = tile.improvementInProgress!!.removePrefix("Remove ")
if (tile.ruleset.terrains[removedFeature]!!.uniques val removedFeatureObject = tile.ruleset.terrains[removedFeatureName]
if (removedFeatureObject!=null && removedFeatureObject.uniques
.contains("Provides a one-time Production bonus to the closest city when cut down")) { .contains("Provides a one-time Production bonus to the closest city when cut down")) {
tryProvideProductionToClosestCity(removedFeature) tryProvideProductionToClosestCity(removedFeatureName)
} }
tile.terrainFeatures.remove(removedFeature) tile.terrainFeatures.remove(removedFeatureName)
} }
} }
tile.improvementInProgress == "Road" -> tile.roadStatus = RoadStatus.Road tile.improvementInProgress == "Road" -> tile.roadStatus = RoadStatus.Road