AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 14:24:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tests

Browse Source
This commit is contained in:
Yair Morgenstern 2021-02-05 10:34:42 +02:00
parent 45b43849bd
commit a27a28df67
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View File

@ -308,7 +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 // 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() { fun updateHasOpenBorders() {
val newHasOpenBorders = civInfo.getAllyCiv() == otherCivName || otherCiv().getAllyCiv() == civInfo.civName // City-states can enter ally's territory (the opposite is true anyway even without open borders)
val newHasOpenBorders = civInfo.getAllyCiv() == otherCivName
|| trades.flatMap { it.theirOffers }.any { it.name == Constants.openBorders && it.duration > 0 } || trades.flatMap { it.theirOffers }.any { it.name == Constants.openBorders && it.duration > 0 }
val bordersWereClosed = hasOpenBorders && !newHasOpenBorders val bordersWereClosed = hasOpenBorders && !newHasOpenBorders