From 91baeddde2d5c634ed85fbf8bcbcd6ff6ebb6a9f Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Fri, 10 May 2019 18:33:12 +0800 Subject: [PATCH] Fix crash from diplomacy screen. --- core/src/com/unciv/ui/EmpireOverviewScreen.kt | 6 ++++-- core/src/com/unciv/ui/trade/DiplomacyScreen.kt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/ui/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/EmpireOverviewScreen.kt index e17c2e9eca..cd5397ee24 100644 --- a/core/src/com/unciv/ui/EmpireOverviewScreen.kt +++ b/core/src/com/unciv/ui/EmpireOverviewScreen.kt @@ -327,9 +327,11 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){ } for(civ in relevantCivs.filter { playerKnows(it) && !it.isDefeated() }) - for(diplomacy in civ.diplomacy.values.filter { !it.otherCiv().isBarbarianCivilization() && playerKnows(it.otherCiv()) && !it.otherCiv().isDefeated()}){ + for(diplomacy in civ.diplomacy.values. + filter { !it.otherCiv().isBarbarianCivilization() && !it.otherCiv().isCityState() + && playerKnows(it.otherCiv()) && !it.otherCiv().isDefeated()}){ val civGroup = civGroups[civ.civName]!! - val otherCivGroup = civGroups[diplomacy.otherCivName]!! + val otherCivGroup = civGroups[diplomacy.otherCivName]!! // val statusLine = ImageGetter.getLine(civGroup.x+civGroup.width/2,civGroup.y+civGroup.height/2, otherCivGroup.x+otherCivGroup.width/2,otherCivGroup.y+otherCivGroup.height/2,3f) diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index e5d53737a3..e0030801d4 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -92,7 +92,7 @@ class DiplomacyScreen:CameraStageBaseScreen() { val diplomacyTable = Table() diplomacyTable.defaults().pad(10f) if (otherCiv.isCityState()) { - diplomacyTable.add(otherCiv.getNation().getLeaderDisplayName().toLabel()) + diplomacyTable.add(otherCiv.getNation().getLeaderDisplayName().toLabel()).row() diplomacyTable.add(("Type : " + otherCiv.getCityStateType().toString()).toLabel()).row() diplomacyTable.add(("Influence : " + otherCiv.getDiplomacyManager(currentPlayerCiv).influence.toInt().toString()).toLabel()).row() if (otherCiv.getDiplomacyManager(currentPlayerCiv).influence >= 60) {