diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index a99518d298..7e2167812b 100644 --- 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()}