mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 01:39:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

Units are not displaced to enemy land when kicked out of borders

Browse Source
This commit is contained in:
Yair Morgenstern
2023-01-08 11:45:08 +02:00
parent fe6c19532a
commit b669c2ab1b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
View File

@ -404,8 +404,8 @@ class UnitMovementAlgorithms(val unit: MapUnit) {
while (allowedTile == null && distance < 5) { while (allowedTile == null && distance < 5) {
distance++ distance++
allowedTile = unit.getTile().getTilesAtDistance(distance) allowedTile = unit.getTile().getTilesAtDistance(distance)
// can the unit be placed safely there? // can the unit be placed safely there? Is tile either unowned or friendly?
.filter { canMoveTo(it) } .filter { canMoveTo(it) && it.getOwner()?.isAtWarWith(unit.civInfo) != true }
// out of those where it can be placed, can it reach them in any meaningful way? // out of those where it can be placed, can it reach them in any meaningful way?
.firstOrNull { getPathBetweenTiles(unit.currentTile, it).contains(it) } .firstOrNull { getPathBetweenTiles(unit.currentTile, it).contains(it) }
} }