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

Resolved #9638 - Removing old buildings on enemy capital (when not last city) no longer crashes

Browse Source
This commit is contained in:
Yair Morgenstern 2023-06-23 10:17:45 +03:00
parent ee668710e2
commit a246baa333
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/unciv/logic/city/managers/CityInfoConquestFunctions.kt
View File

@ -289,16 +289,16 @@ class CityInfoConquestFunctions(val city: City){
// Stop WLTKD if it's still going
resetWLTKD()
// Remove their free buildings from this city and remove free buildings provided by the city from their cities
removeBuildingsOnMoveToCiv(oldCiv)
// Place palace for newCiv if this is the only city they have
// This needs to happen _before_ free buildings are added, as sometimes these should
// only be placed in the capital, and then there needs to be a capital.
// Place palace for newCiv if this is the only city they have.
// This needs to happen _before_ buildings are added or removed,
// as any building change triggers a reevaluation of stats which assumes there to be a capital
if (newCiv.cities.size == 1) {
newCiv.moveCapitalTo(this)
}
// Remove their free buildings from this city and remove free buildings provided by the city from their cities
removeBuildingsOnMoveToCiv(oldCiv)
// Add our free buildings to this city and add free buildings provided by the city to other cities
civ.civConstructions.tryAddFreeBuildings()