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

* fix: lateinit property cityInfo has not been initialized issue. * use loop instead of foreach.
yairm210 · Sep 5, 2022 · 7a1c025 · 7a1c025
1 parent 313290c
commit 7a1c025
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt
@@ -492,6 +492,10 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion
         for (religion in religions.values) religion.setTransients(this)
 
         for (civInfo in civilizations) civInfo.setTransients()
+        for (civInfo in civilizations) {
+            civInfo.thingsToFocusOnForVictory =
+                    civInfo.getPreferredVictoryTypeObject()?.getThingsToFocus(civInfo) ?: setOf()
+        }
 
         convertFortify()
 

diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@@ -839,8 +839,6 @@ class CivilizationInfo : IsPartOfGameInfoSerialization {
 
         victoryManager.civInfo = this
 
-        thingsToFocusOnForVictory = getPreferredVictoryTypeObject()?.getThingsToFocus(this) ?: setOf()
-
         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.setTransients()