From 4ba822ca4942ceea2e44df40791804f1ef4b442a Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 26 Feb 2023 23:19:24 +0200 Subject: [PATCH] Resolved #8762 - Civilopedia does not crash when displaying techs on fresh start --- core/src/com/unciv/models/ruleset/tech/Technology.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/models/ruleset/tech/Technology.kt b/core/src/com/unciv/models/ruleset/tech/Technology.kt index d727ba964d..0c29f53bcb 100644 --- a/core/src/com/unciv/models/ruleset/tech/Technology.kt +++ b/core/src/com/unciv/models/ruleset/tech/Technology.kt @@ -11,8 +11,8 @@ import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.translations.tr -import com.unciv.ui.screens.civilopediascreen.FormattedLine import com.unciv.ui.components.Fonts +import com.unciv.ui.screens.civilopediascreen.FormattedLine class Technology: RulesetObject() { @@ -224,7 +224,7 @@ class Technology: RulesetObject() { } } - val viewingCiv = GUI.getViewingPlayer() + val viewingCiv = if (GUI.isWorldLoaded()) GUI.getViewingPlayer() else null val enabledUnits = getEnabledUnits(ruleset, viewingCiv) if (enabledUnits.any()) { lineList += FormattedLine()