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

Add null check for connect road cross-version saves (#10699)

Browse Source 
* Add null checks to fix #10691

* Issue reference unnecessary
This commit is contained in:
Will Allen
2023-12-10 14:59:01 -06:00
committed by GitHub
parent a503695e31
commit e9752292eb
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt
View File

@ -139,6 +139,7 @@ class WorkerAutomation(
fun automateConnectRoad(unit: MapUnit, tilesWhereWeWillBeCaptured: Set<Tile>){ fun automateConnectRoad(unit: MapUnit, tilesWhereWeWillBeCaptured: Set<Tile>){
if (actualBestRoadAvailable == RoadStatus.None) return if (actualBestRoadAvailable == RoadStatus.None) return
var currentTile = unit.getTile() var currentTile = unit.getTile()
/** Reset side effects from automation, return worker to non-automated state*/ /** Reset side effects from automation, return worker to non-automated state*/
@ -150,6 +151,11 @@ class WorkerAutomation(
currentTile.stopWorkingOnImprovement() currentTile.stopWorkingOnImprovement()
} }
if (unit.automatedRoadConnectionDestination == null){
stopAndCleanAutomation()
return
}
/** Conditions for whether it is acceptable to build a road on this tile */ /** Conditions for whether it is acceptable to build a road on this tile */
fun shouldBuildRoadOnTile(tile: Tile): Boolean { fun shouldBuildRoadOnTile(tile: Tile): Boolean {
return !tile.isCityCenter() // Can't build road on city tiles return !tile.isCityCenter() // Can't build road on city tiles

1
core/src/com/unciv/ui/screens/worldscreen/WorldMapHolder.kt
View File

@ -791,6 +791,7 @@ class WorldMapHolder(
// Z-Layer: 4 // Z-Layer: 4
// Highlight road path for workers currently connecting roads // Highlight road path for workers currently connecting roads
if (unit.isAutomatingRoadConnection()) { if (unit.isAutomatingRoadConnection()) {
if (unit.automatedRoadConnectionPath == null) return
val currTileIndex = unit.automatedRoadConnectionPath!!.indexOf(unit.currentTile.position) val currTileIndex = unit.automatedRoadConnectionPath!!.indexOf(unit.currentTile.position)
if (currTileIndex != -1) { if (currTileIndex != -1) {
val futureTiles = unit.automatedRoadConnectionPath!!.filterIndexed { index, _ -> val futureTiles = unit.automatedRoadConnectionPath!!.filterIndexed { index, _ ->