AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 22:06:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid addGreatPerson exception.

Browse Source
This commit is contained in:
Duan Tao 2018-12-27 10:58:50 +08:00
parent 2575ffd01f
commit 0e77d5b044
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -350,11 +350,15 @@ class CivilizationInfo {
city.endTurn() city.endTurn()
} }
val greatPerson = greatPeople.getNewGreatPerson() //if no city available, addGreatPerson will throw exception
if (greatPerson != null) { if (!cities.isNotEmpty()) {
addGreatPerson(greatPerson) val greatPerson = greatPeople.getNewGreatPerson()
if (greatPerson != null) {
addGreatPerson(greatPerson)
}
} }
goldenAges.endTurn(happiness) goldenAges.endTurn(happiness)
getCivUnits().forEach { it.endTurn() } getCivUnits().forEach { it.endTurn() }
diplomacy.values.forEach{it.nextTurn()} diplomacy.values.forEach{it.nextTurn()}