Avoid addGreatPerson exception.

2025-09-26 21:35:14 -04:00 · 2018-12-27 10:58:50 +08:00 · 2018-12-27 10:58:50 +08:00 · 0e77d5b044
commit 0e77d5b044
parent 2575ffd01f
1 changed files with 7 additions and 3 deletions
--- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
+++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@ -350,11 +350,15 @@ class CivilizationInfo {
            city.endTurn()
        }

-        val greatPerson = greatPeople.getNewGreatPerson()
-        if (greatPerson != null) {
-            addGreatPerson(greatPerson)
+        //if no city available, addGreatPerson will throw exception
+        if (!cities.isNotEmpty()) {
+            val greatPerson = greatPeople.getNewGreatPerson()
+            if (greatPerson != null) {
+                addGreatPerson(greatPerson)
+            }
        }

+
        goldenAges.endTurn(happiness)
        getCivUnits().forEach { it.endTurn() }
        diplomacy.values.forEach{it.nextTurn()}