Check non-null when removing road (fix #8249) (#8250)

yairm210 · Dec 28, 2022 · 0519b92 · 0519b92
1 parent 84fe92f
commit 0519b92
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt
@@ -306,10 +306,11 @@ open class TileInfo : IsPartOfGameInfoSerialization {
 
     // function handling when removing a road from the tile
     fun removeRoad() {
-        roadStatus = RoadStatus.None
         roadIsPillaged = false
+        if (roadStatus == RoadStatus.None) return
+        roadStatus = RoadStatus.None
         if (owningCity == null)
-            getRoadOwner()!!.neutralRoads.remove(this.position)
+            getRoadOwner()?.neutralRoads?.remove(this.position)
     }
 
     fun getShownImprovement(viewingCiv: CivilizationInfo?): String? {