From f10bf8bfbe3ec18ced8b7a900bcc633a22560f00 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 20 Jun 2022 09:49:22 +0300 Subject: [PATCH] Resolved crash for victory condition not in ruleset --- core/src/com/unciv/logic/civilization/VictoryManager.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/civilization/VictoryManager.kt b/core/src/com/unciv/logic/civilization/VictoryManager.kt index 568895980c..f6dec75268 100644 --- a/core/src/com/unciv/logic/civilization/VictoryManager.kt +++ b/core/src/com/unciv/logic/civilization/VictoryManager.kt @@ -55,7 +55,8 @@ class VictoryManager { fun getVictoryTypeAchieved(): String? { if (!civInfo.isMajorCiv()) return null - for (victoryName in civInfo.gameInfo.gameParameters.victoryTypes.filter { it != Constants.neutralVictoryType}) { + for (victoryName in civInfo.gameInfo.gameParameters.victoryTypes + .filter { it != Constants.neutralVictoryType && it in civInfo.gameInfo.ruleSet.victories}) { if (getNextMilestone(victoryName) == null) return victoryName }