Fix Zone of Control (#6891)

This commit is contained in:
itanasi 2022-05-21 06:24:18 -07:00 committed by GitHub
parent 915f3e694f
commit 8b9946e65e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -92,7 +92,7 @@ class UnitMovementAlgorithms(val unit: MapUnit) {
yield(tile)
}
else if (tile.militaryUnit != null && civInfo.isAtWarWith(tile.militaryUnit!!.civInfo)) {
if (tile.militaryUnit!!.type.isWaterUnit() || (unit.type.isLandUnit() && tile.militaryUnit!!.isEmbarked()))
if (tile.militaryUnit!!.type.isWaterUnit() || (unit.type.isLandUnit() && !tile.militaryUnit!!.isEmbarked()))
yield(tile)
}
}
@ -126,7 +126,6 @@ class UnitMovementAlgorithms(val unit: MapUnit) {
// anyway.
if (unit.ignoresZoneOfControl)
return false
return true
}