From 325b8dcc380cead0696336215f6d33c0552ed3a5 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Sun, 25 May 2025 18:41:51 +0300 Subject: [PATCH] Avoid crash from "remove building in this city" uniques when not applied in the context of a city - see #13348 --- .../com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt index ec54c0f848..02db85d667 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt @@ -945,7 +945,7 @@ object UniqueTriggerActivation { UniqueType.RemoveBuilding -> { val applicableCities = - if (unique.params[1] == "in this city") sequenceOf(relevantCity!!) + if (unique.params[1] == "in this city") if (relevantCity == null) emptySequence() else sequenceOf(relevantCity!!) else civInfo.cities.asSequence().filter { it.matchesFilter(unique.params[1]) } if (applicableCities.none()) return null