From f3378f4ced429d2184afd1f95720924b7d3a2e65 Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Thu, 9 Dec 2021 20:37:37 +0200
Subject: [PATCH] 3.18.8-patch1 Resolved #5774 - removed demanded resource from
 city when resource is not in ruleset

---
 buildSrc/src/main/kotlin/BuildConfig.kt | 2 +-
 core/src/com/unciv/logic/GameInfo.kt    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index ddde271099..e2190d5987 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -4,7 +4,7 @@ object BuildConfig {
     const val kotlinVersion = "1.5.30"
     const val appName = "Unciv"
     const val appCodeNumber = 654
-    const val appVersion = "3.18.8"
+    const val appVersion = "3.18.8-patch1"
 
     const val gdxVersion = "1.10.0"
     const val roboVMVersion = "2.3.1"
diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt
index 5725b045f2..894f34311e 100644
--- a/core/src/com/unciv/logic/GameInfo.kt
+++ b/core/src/com/unciv/logic/GameInfo.kt
@@ -429,6 +429,10 @@ class GameInfo {
                 if (cityInfo.isPuppet && cityInfo.cityConstructions.constructionQueue.isEmpty())
                     cityInfo.cityConstructions.chooseNextConstruction()
 
+                // We also remove resources that the city may be demanding but are no longer in the ruleset
+                if (!ruleSet.tileResources.containsKey(cityInfo.demandedResource))
+                    cityInfo.demandedResource = ""
+
                 cityInfo.cityStats.update()
             }