From 24d7a57c1f8e6f5d8c19b4c75979f7b2193fd410 Mon Sep 17 00:00:00 2001 From: Xander Lenstra <71121390+xlenstra@users.noreply.github.com> Date: Sun, 10 Oct 2021 16:10:36 +0200 Subject: [PATCH] Fixed a bug where religious units would be expelled when an open borders agreement ended (#5448) --- core/src/com/unciv/logic/trade/TradeLogic.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/trade/TradeLogic.kt b/core/src/com/unciv/logic/trade/TradeLogic.kt index a7d926b342..2cb0887a4d 100644 --- a/core/src/com/unciv/logic/trade/TradeLogic.kt +++ b/core/src/com/unciv/logic/trade/TradeLogic.kt @@ -94,7 +94,8 @@ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: Ci city.getCenterTile().getUnits().toList().forEach { it.movement.teleportToClosestMoveableTile() } for (tile in city.getTiles()) { for (unit in tile.getUnits().toList()) { - if (!unit.civInfo.canPassThroughTiles(to)) unit.movement.teleportToClosestMoveableTile() + if (!unit.civInfo.canPassThroughTiles(to) && !unit.canEnterForeignTerrain) + unit.movement.teleportToClosestMoveableTile() } } to.updateViewableTiles()