From 9e239de6ce38700a40ca812e9be2564314162250 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 3 Apr 2023 21:54:52 +0300 Subject: [PATCH] Resolved #9103 - invalid conditionals on building uniques no longer lead to crashes --- core/src/com/unciv/models/ruleset/Building.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index ad614272ba..5dad119cdf 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -666,7 +666,7 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction { val triggerNotificationText ="due to constructing [$name]" for (unique in uniqueObjects) - if (unique.conditionals.none { it.type!!.targetTypes.contains(UniqueTarget.TriggerCondition) }) + if (unique.conditionals.none { it.type?.targetTypes?.contains(UniqueTarget.TriggerCondition)==true }) UniqueTriggerActivation.triggerCivwideUnique(unique, civInfo, cityConstructions.city, triggerNotificationText = triggerNotificationText)