From b2557de5d0d8193f31ef549e48bf9d4f2d230363 Mon Sep 17 00:00:00 2001 From: Xander Lenstra <71121390+xlenstra@users.noreply.github.com> Date: Tue, 26 Oct 2021 07:31:39 +0200 Subject: [PATCH] Fixed a bug where every improvement pretended to be a citadel (#5563) --- core/src/com/unciv/logic/map/MapUnit.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index 9601af6d65..30295ce5b6 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -1015,7 +1015,10 @@ class MapUnit { // Check for Citadel damage - note: 'Damage does not stack with other Citadels' val citadelTile = currentTile.neighbors .filter { - it.getOwner() != null && civInfo.isAtWarWith(it.getOwner()!!) && it.improvement != null + it.getOwner() != null + && it.improvement != null + && civInfo.isAtWarWith(it.getOwner()!!) + && it.getTileImprovement()!!.hasUnique(UniqueType.DamagesAdjacentEnemyUnits) }.maxByOrNull { tile -> tile.getTileImprovement()!! .getMatchingUniques(UniqueType.DamagesAdjacentEnemyUnits)