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

fix: lateinit property cityInfo has not been initialized issue. (#7739)

Browse Source 
* fix: lateinit property cityInfo has not been initialized issue.

* use loop instead of foreach.
This commit is contained in:
nacro711072
2022-09-05 14:15:58 +08:00
committed by GitHub
parent 313290c994
commit 7a1c025e10
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/GameInfo.kt
View File

@ -492,6 +492,10 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion
for (religion in religions.values) religion.setTransients(this) for (religion in religions.values) religion.setTransients(this)
for (civInfo in civilizations) civInfo.setTransients() for (civInfo in civilizations) civInfo.setTransients()
for (civInfo in civilizations) {
civInfo.thingsToFocusOnForVictory =
civInfo.getPreferredVictoryTypeObject()?.getThingsToFocus(civInfo) ?: setOf()
}
convertFortify() convertFortify()

2
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -839,8 +839,6 @@ class CivilizationInfo : IsPartOfGameInfoSerialization {
victoryManager.civInfo = this victoryManager.civInfo = this
thingsToFocusOnForVictory = getPreferredVictoryTypeObject()?.getThingsToFocus(this) ?: setOf()
for (cityInfo in cities) { for (cityInfo in cities) {
cityInfo.civInfo = this // must be before the city's setTransients because it depends on the tilemap, that comes from the currentPlayerCivInfo cityInfo.civInfo = this // must be before the city's setTransients because it depends on the tilemap, that comes from the currentPlayerCivInfo
cityInfo.setTransients() cityInfo.setTransients()