From 9eb2d1fffbe99d7bfcf35ae7cce1cc1e59cbe204 Mon Sep 17 00:00:00 2001 From: Xander Lenstra <71121390+xlenstra@users.noreply.github.com> Date: Sat, 19 Jun 2021 20:40:46 +0200 Subject: [PATCH] Stop AI from pillaging their own tiles. Fixes #4203 (#4204) --- core/src/com/unciv/logic/automation/UnitAutomation.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt index 0635fc5ad4..f603e145a9 100644 --- a/core/src/com/unciv/logic/automation/UnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt @@ -223,8 +223,9 @@ object UnitAutomation { if (unit.type.isCivilian()) return false val unitDistanceToTiles = unit.movement.getDistanceToTiles() val tilesThatCanWalkToAndThenPillage = unitDistanceToTiles - .filter { it.value.totalDistance < unit.currentMovement }.keys - .filter { unit.movement.canMoveTo(it) && UnitActions.canPillage(unit, it) } + .filter { it.value.totalDistance < unit.currentMovement }.keys + .filter { unit.movement.canMoveTo(it) && UnitActions.canPillage(unit, it) } + .filter { it.getOwner() != unit.civInfo } if (tilesThatCanWalkToAndThenPillage.isEmpty()) return false val tileToPillage = tilesThatCanWalkToAndThenPillage.maxByOrNull { it: TileInfo -> it.getDefensiveBonus() }!!