mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-19 16:57:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #9333 - Improperly configured mod conditionals do not cause crash

Browse Source
This commit is contained in:
Yair Morgenstern 2023-05-07 09:52:59 +03:00
parent 32041d5b49
commit 7b5ed07805
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/models/ruleset/unique/Unique.kt
View File

@ -125,7 +125,7 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
): Boolean { ): Boolean {
val nonConditionalConditionTypes = setOf(UniqueTarget.TriggerCondition, UniqueTarget.UnitTriggerCondition, UniqueTarget.UnitActionModifier) val nonConditionalConditionTypes = setOf(UniqueTarget.TriggerCondition, UniqueTarget.UnitTriggerCondition, UniqueTarget.UnitActionModifier)
if (condition.type!!.targetTypes.any { it in nonConditionalConditionTypes }) if (condition.type?.targetTypes?.any { it in nonConditionalConditionTypes } == true)
return true // not a filtering condition return true // not a filtering condition
fun ruleset() = state.civInfo!!.gameInfo.ruleset fun ruleset() = state.civInfo!!.gameInfo.ruleset