From 5846da6f8a40cc3013498a8a1f86abc886885a62 Mon Sep 17 00:00:00 2001
From: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Date: Fri, 22 Jul 2022 20:14:08 +0200
Subject: [PATCH] cover more cases

---
 .../unciv/logic/civilization/CityStateFunctions.kt | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/CityStateFunctions.kt b/core/src/com/unciv/logic/civilization/CityStateFunctions.kt
index 88280818cc..73f1326405 100644
--- a/core/src/com/unciv/logic/civilization/CityStateFunctions.kt
+++ b/core/src/com/unciv/logic/civilization/CityStateFunctions.kt
@@ -305,14 +305,12 @@ class CityStateFunctions(val civInfo: CivilizationInfo) {
         for (unit in civInfo.getCivUnits())
             unit.gift(otherCiv)
 
-        // We want to get rid of the original capital flag for this city state so it can't be liberated in the future.
-        // We do this step to be extra certain to find the correct one since a CS can rarely capture and lose cities
-        val originalCapital = civInfo.gameInfo.getCities().firstOrNull {
-            it.isOriginalCapital && it.foundingCiv == civInfo.civName
-        }
-        if (originalCapital != null) {
-            originalCapital.foundingCiv = ""
-            originalCapital.isOriginalCapital = false
+        // Make sure this CS can never be liberated
+        civInfo.gameInfo.getCities().filter {
+            it.foundingCiv == civInfo.civName
+        }.forEach {
+            it.foundingCiv = ""
+            it.isOriginalCapital = false
         }
 
         for (city in civInfo.cities) {