From cfc337f6ef9e815ddd887b924a0c5ba96b42f26d Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 5 Feb 2021 10:22:01 +0200 Subject: [PATCH] City-state allies are always considered to have open borders --- .../logic/civilization/diplomacy/DiplomacyManager.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index f51e3c4117..8faa2618ab 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -108,8 +108,8 @@ class DiplomacyManager() { } constructor(civilizationInfo: CivilizationInfo, OtherCivName:String) : this() { - civInfo=civilizationInfo - otherCivName=OtherCivName + civInfo = civilizationInfo + otherCivName = OtherCivName updateHasOpenBorders() } @@ -308,8 +308,8 @@ class DiplomacyManager() { // for performance reasons we don't want to call this every time we want to see if a unit can move through a tile fun updateHasOpenBorders() { - val newHasOpenBorders = trades.flatMap { it.theirOffers } - .any { it.name == Constants.openBorders && it.duration > 0 } + val newHasOpenBorders = civInfo.getAllyCiv() == otherCivName || otherCiv().getAllyCiv() == civInfo.civName + || trades.flatMap { it.theirOffers }.any { it.name == Constants.openBorders && it.duration > 0 } val bordersWereClosed = hasOpenBorders && !newHasOpenBorders hasOpenBorders = newHasOpenBorders