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

Resolved #8337 - Fixed crash on one city challenge when conquering capital and enemy has only puppeted cities left

Browse Source
This commit is contained in:
Yair Morgenstern
2023-01-08 15:04:36 +02:00
parent ecd52feaf8
commit 75130322a8
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -779,6 +779,13 @@ class CityInfo : IsPartOfGameInfoSerialization {
for (tile in getTiles()) { for (tile in getTiles()) {
expansion.relinquishOwnership(tile) expansion.relinquishOwnership(tile)
} }
// Move the capital if destroyed (by a nuke or by razing)
// Must be before removing existing capital because we may be annexing a puppet which means city stats update - see #8337
if (isCapital() && civInfo.cities.size > 1) {
civInfo.moveCapitalToNextLargest()
}
civInfo.cities = civInfo.cities.toMutableList().apply { remove(this@CityInfo) } civInfo.cities = civInfo.cities.toMutableList().apply { remove(this@CityInfo) }
getCenterTile().changeImprovement("City ruins") getCenterTile().changeImprovement("City ruins")
@ -789,9 +796,6 @@ class CityInfo : IsPartOfGameInfoSerialization {
unit.movement.teleportToClosestMoveableTile() unit.movement.teleportToClosestMoveableTile()
} }
if (isCapital() && civInfo.cities.isNotEmpty()) { // Move the capital if destroyed (by a nuke or by razing)
civInfo.moveCapitalToNextLargest()
}
// Update proximity rankings for all civs // Update proximity rankings for all civs
for (otherCiv in civInfo.gameInfo.getAliveMajorCivs()) { for (otherCiv in civInfo.gameInfo.getAliveMajorCivs()) {