mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-05 21:11:35 +07:00
Code Issues Packages Projects Releases Wiki Activity

Avoid crashes with incorrect condtionals (#9753)

Browse Source
This commit is contained in:
SeventhM 2023-07-05 12:57:06 -07:00 committed by GitHub
parent fdb07b06c1
commit d2dac66f40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,8 +44,10 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
fun hasTriggerConditional(): Boolean {
if(conditionals.none()) return false
return conditionals.any{ conditional -> conditional.type!!.targetTypes
.any{ it.canAcceptUniqueTarget(UniqueTarget.TriggerCondition) } }
return conditionals.any{ conditional -> conditional.type?.targetTypes
?.any{ it.canAcceptUniqueTarget(UniqueTarget.TriggerCondition) }
?: false
}
}
fun isOfType(uniqueType: UniqueType) = uniqueType == type