From b64391d7676b0ce7c3576b92f7623c80ef8fb93c Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 10 May 2020 20:32:34 +0300 Subject: [PATCH] Population assigned to tiles of other cities do not auto-unassign --- core/src/com/unciv/logic/city/PopulationManager.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/city/PopulationManager.kt b/core/src/com/unciv/logic/city/PopulationManager.kt index c69757e998..8b1443170b 100644 --- a/core/src/com/unciv/logic/city/PopulationManager.kt +++ b/core/src/com/unciv/logic/city/PopulationManager.kt @@ -110,9 +110,9 @@ class PopulationManager { fun unassignExtraPopulation() { for(tile in cityInfo.workedTiles.map { cityInfo.tileMap[it] }) { - if (tile.getCity() != cityInfo) + if (tile.getOwner() != cityInfo.civInfo) cityInfo.workedTiles = cityInfo.workedTiles.withoutItem(tile.position) - if(tile.aerialDistanceTo(cityInfo.getCenterTile()) > 3) + if (tile.aerialDistanceTo(cityInfo.getCenterTile()) > 3) cityInfo.workedTiles = cityInfo.workedTiles.withoutItem(tile.position) }