Resolved #14574 - Removing improvement-creating buildings where the improvement is not in any tile in the city, no longer crashes

yairm210 · yairm210 · commit 4a0a55180cc7 · 2026-02-22T22:38:53.000+02:00
diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt
@@ -664,8 +664,8 @@ class CityConstructions : IsPartOfGameInfoSerialization {
         
         if (building.hasCreateOneImprovementUnique()){
             val improvement = building.getImprovementToCreate(city.getRuleset(), city.civ)!!
-            val tileWithImprovementToRemove = city.getTiles().first { it.improvement == improvement.name }
-            tileWithImprovementToRemove.removeImprovement()
+            val tileWithImprovementToRemove = city.getTiles().firstOrNull { it.improvement == improvement.name }
+            tileWithImprovementToRemove?.removeImprovement()
         }
         
         updateUniques()

Original file line number	Diff line number	Diff line change
`@@ -664,8 +664,8 @@ class CityConstructions : IsPartOfGameInfoSerialization {`
`664`	`664`
`665`	`665`	`if (building.hasCreateOneImprovementUnique()){`
`666`	`666`	`val improvement = building.getImprovementToCreate(city.getRuleset(), city.civ)!!`
`667`		`- val tileWithImprovementToRemove = city.getTiles().first { it.improvement == improvement.name }`
`668`		`- tileWithImprovementToRemove.removeImprovement()`
	`667`	`+ val tileWithImprovementToRemove = city.getTiles().firstOrNull { it.improvement == improvement.name }`
	`668`	`+ tileWithImprovementToRemove?.removeImprovement()`
`669`	`669`	`}`
`670`	`670`
`671`	`671`	`updateUniques()`