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 a bug where every improvement pretended to be a citadel (#5563)

Browse Source
This commit is contained in:
Xander Lenstra 2021-10-26 07:31:39 +02:00 committed by GitHub
parent cbfbec166b
commit b2557de5d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -1015,7 +1015,10 @@ class MapUnit {
// Check for Citadel damage - note: 'Damage does not stack with other Citadels' // Check for Citadel damage - note: 'Damage does not stack with other Citadels'
val citadelTile = currentTile.neighbors val citadelTile = currentTile.neighbors
.filter { .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 -> }.maxByOrNull { tile ->
tile.getTileImprovement()!! tile.getTileImprovement()!!
.getMatchingUniques(UniqueType.DamagesAdjacentEnemyUnits) .getMatchingUniques(UniqueType.DamagesAdjacentEnemyUnits)