From 4421a2a54eb5198eeea5fc5476ed15d52aa2a853 Mon Sep 17 00:00:00 2001
From: SeventhM <127357473+SeventhM@users.noreply.github.com>
Date: Wed, 19 Jul 2023 23:16:02 -0700
Subject: [PATCH] Fix issues when adding/removing buildings (#9822)

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

diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt
index cdb12a3a3b..69634bb458 100644
--- a/core/src/com/unciv/logic/city/CityConstructions.kt
+++ b/core/src/com/unciv/logic/city/CityConstructions.kt
@@ -493,6 +493,9 @@ class CityConstructions : IsPartOfGameInfoSerialization {
         builtBuildingObjects = builtBuildingObjects.withItem(building)
         builtBuildings.add(buildingName)
 
+        city.civ.cache.updateCitiesConnectedToCapital(false) // could be a connecting building, like a harbor
+        city.civ.cache.updateCivResources() // this building could be a resource-requiring one
+
         /** Support for [UniqueType.CreatesOneImprovement] */
         applyCreateOneImprovement(building)
 
@@ -522,9 +525,6 @@ class CityConstructions : IsPartOfGameInfoSerialization {
             city.reassignPopulationDeferred()
 
         updateUniques()
-
-        civ.cache.updateCivResources() // this building could be a resource-requiring one
-        civ.cache.updateCitiesConnectedToCapital(false) // could be a connecting building, like a harbor
     }
 
     fun triggerNewBuildingUniques(building: Building) {
@@ -551,8 +551,8 @@ class CityConstructions : IsPartOfGameInfoSerialization {
             builtBuildingObjects = builtBuildingObjects.withoutItem(buildingObject)
         else builtBuildingObjects.removeAll{ it.name == buildingName }
         builtBuildings.remove(buildingName)
-        city.civ.cache.updateCivResources() // this building could be a resource-requiring one
         city.civ.cache.updateCitiesConnectedToCapital(false) // could be a connecting building, like a harbor
+        city.civ.cache.updateCivResources() // this building could be a resource-requiring one
         updateUniques()
     }