mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-11 16:29:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

Population assigned to tiles of other cities do not auto-unassign

Browse Source
This commit is contained in:
Yair Morgenstern
2020-05-10 20:32:34 +03:00
parent f605a0c00f
commit b64391d767
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/city/PopulationManager.kt
View File

@ -110,9 +110,9 @@ class PopulationManager {
fun unassignExtraPopulation() { fun unassignExtraPopulation() {
for(tile in cityInfo.workedTiles.map { cityInfo.tileMap[it] }) { 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) 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) cityInfo.workedTiles = cityInfo.workedTiles.withoutItem(tile.position)
} }