From 7a1c025e1035eb1e22b7f116715adb22d00c4238 Mon Sep 17 00:00:00 2001 From: nacro711072 Date: Mon, 5 Sep 2022 14:15:58 +0800 Subject: [PATCH] fix: lateinit property cityInfo has not been initialized issue. (#7739) * fix: lateinit property cityInfo has not been initialized issue. * use loop instead of foreach. --- core/src/com/unciv/logic/GameInfo.kt | 4 ++++ core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt index 66abd4791d4de..ea4c23ef1ae6a 100644 --- 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 index 79bc2ab0c7d65..8b6ae67197ca2 100644 --- 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()