From 436917f2afca133df095dc63d1344f8171a2196f Mon Sep 17 00:00:00 2001
From: itanasi <44038014+itanasi@users.noreply.github.com>
Date: Wed, 3 Aug 2022 07:08:46 -0700
Subject: [PATCH] Allow Citizen Management to pick any tile owned within 3
 tiles (#7533)

---
 core/src/com/unciv/logic/city/PopulationManager.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/logic/city/PopulationManager.kt b/core/src/com/unciv/logic/city/PopulationManager.kt
index f707ff6131..2b3311c232 100644
--- a/core/src/com/unciv/logic/city/PopulationManager.kt
+++ b/core/src/com/unciv/logic/city/PopulationManager.kt
@@ -122,10 +122,12 @@ class PopulationManager : IsPartOfGameInfoSerialization {
                 specialistFoodBonus *= unique.params[0].toPercent()
         specialistFoodBonus = 2f - specialistFoodBonus
 
+        val currentCiv = cityInfo.civInfo
+
         for (i in 1..getFreePopulation()) {
             //evaluate tiles
-            val (bestTile, valueBestTile) = cityInfo.getTiles()
-                    .filter { it.aerialDistanceTo(cityInfo.getCenterTile()) <= 3 }
+            val (bestTile, valueBestTile) = cityInfo.getCenterTile().getTilesInDistance(3)
+                    .filter { it.getOwner() == currentCiv }
                     .filterNot { it.providesYield() }
                     .associateWith { Automation.rankTileForCityWork(it, cityInfo, cityStats) }
                     .maxByOrNull { it.value }