From bf8ccee943bcd4d7d8764806c404a0f9c7277feb Mon Sep 17 00:00:00 2001 From: yairm210 Date: Mon, 7 Oct 2024 08:53:54 +0300 Subject: [PATCH] Modding: Resolved badly configured ruins causing crashes --- .../unciv/models/ruleset/unique/UniqueTriggerActivation.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt index ae6a365961..62f2878726 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt @@ -237,8 +237,10 @@ object UniqueTriggerActivation { return { placeUnits() } } UniqueType.OneTimeFreeUnitRuins -> { - var civUnit = civInfo.getEquivalentUnit(unique.params[0]) - if ( civUnit.isCityFounder() && civInfo.isOneCityChallenger()) { + val unitName = unique.params[0] + val baseUnit = ruleset.units[unitName] ?: return null + var civUnit = civInfo.getEquivalentUnit(baseUnit) + if (civUnit.isCityFounder() && civInfo.isOneCityChallenger()) { val replacementUnit = ruleset.units.values .firstOrNull { it.getMatchingUniques(UniqueType.BuildImprovements)