From 0e77d5b04406a7b42b7313c1fad88a700298b86f Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Thu, 27 Dec 2018 10:58:50 +0800 Subject: [PATCH] Avoid addGreatPerson exception. --- .../com/unciv/logic/civilization/CivilizationInfo.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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()}