mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-11 18:39:43 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crashes from era (#5467)

Browse Source
This commit is contained in:
Xander Lenstra 2021-10-12 06:30:20 +02:00 committed by GitHub
parent 58d335f8d4
commit d44bfce665
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/logic/civilization/CivilizationInfo.kt
View File

@ -544,8 +544,10 @@ class CivilizationInfo {
.asSequence() .asSequence()
.filter { it !in tech.researchedTechnologies } .filter { it !in tech.researchedTechnologies }
.map { it.column!! } .map { it.column!! }
.minByOrNull { it.columnNumber }!! .minByOrNull { it.columnNumber }
.era ?.era
?: return maxEra
val minEra = gameInfo.ruleSet.eras[minEraName]!! val minEra = gameInfo.ruleSet.eras[minEraName]!!
return if (minEra.eraNumber > maxEra.eraNumber) minEra return if (minEra.eraNumber > maxEra.eraNumber) minEra