Avoid crash in mod checker for mods with undefined tech requirements (#…

…10744)
yairm210 · Dec 15, 2023 · 297aa3e · 297aa3e
1 parent c607001
commit 297aa3e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/core/src/com/unciv/models/ruleset/unique/IHasUniques.kt b/core/src/com/unciv/models/ruleset/unique/IHasUniques.kt
@@ -62,15 +62,15 @@ interface IHasUniques : INamed {
 
     fun requiredTechs(): Sequence<String> = legacyRequiredTechs() + techsRequiredByUniques()
 
-    fun requiredTechnologies(ruleset: Ruleset): Sequence<Technology> =
-        requiredTechs().map{ ruleset.technologies[it]!! }
+    fun requiredTechnologies(ruleset: Ruleset): Sequence<Technology?> =
+        requiredTechs().map{ ruleset.technologies[it] }
 
     fun era(ruleset: Ruleset): Era? =
-            requiredTechnologies(ruleset).map{ it.era() }.map{ ruleset.eras[it]!! }.maxByOrNull{ it.eraNumber }
-            // This will return null only if requiredTechnologies() is empty.
+            requiredTechnologies(ruleset).map{ it?.era() }.map{ ruleset.eras[it] }.maxByOrNull{ it?.eraNumber ?: 0 }
+            // This will return null only if requiredTechnologies() is empty or all required techs have no eraNumber
 
     fun techColumn(ruleset: Ruleset): TechColumn? =
-            requiredTechnologies(ruleset).map{ it.column }.filterNotNull().maxByOrNull{ it.columnNumber }
+            requiredTechnologies(ruleset).map{ it?.column }.filterNotNull().maxByOrNull{ it.columnNumber }
             // This will return null only if *all* required techs have null TechColumn.
 
     fun availableInEra(ruleset: Ruleset, requestedEra: String): Boolean {