From ce2f128260441e4cf9b6f88a23d08ed35d5046a1 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 5 Mar 2023 14:19:20 +0200 Subject: [PATCH] Fixed endless loop for mod checker --- .../com/unciv/models/ruleset/unique/UniqueParameterType.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt index 3888551380..5bf86ca35b 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt @@ -75,7 +75,7 @@ enum class UniqueParameterType( private val knownValues = setOf("Wounded", Constants.barbarians, "City-State", "Embarked", "Non-City") override fun getErrorSeverity(parameterText: String, ruleset: Ruleset): UniqueType.UniqueComplianceErrorSeverity? { - if ('{' in parameterText) // "{filter} {filter}" for and logic + if (parameterText.startsWith('{')) // "{filter} {filter}" for and logic return parameterText.filterCompositeLogic({ getErrorSeverity(it, ruleset) }) { a, b -> maxOf(a, b) } if (parameterText in knownValues) return null if (ruleset.unitPromotions.values.any { it.hasUnique(parameterText) }) @@ -89,7 +89,7 @@ enum class UniqueParameterType( BaseUnitFilter("baseUnitFilter", "Melee") { override fun getErrorSeverity(parameterText: String, ruleset: Ruleset): UniqueType.UniqueComplianceErrorSeverity? { - if ('{' in parameterText) // "{filter} {filter}" for and logic + if (parameterText.startsWith('{')) // "{filter} {filter}" for and logic return parameterText.filterCompositeLogic({ getErrorSeverity(it, ruleset) }) { a, b -> maxOf(a, b) } if (UnitName.getErrorSeverity(parameterText, ruleset) == null) return null if (ruleset.units.values.any { it.uniques.contains(parameterText) }) return null