From 803575665d8937784425c84688fa8e25b5f0c88c Mon Sep 17 00:00:00 2001
From: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Date: Sat, 18 Sep 2021 22:01:42 +0200
Subject: [PATCH 1/2] fix bug on capturing capital (#5263)

(cherry picked from commit 47d1a5c009205fce21cca720e9151ec2826f27e5)
---
 core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt b/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
index b1d9b26202..0c9a04091e 100644
--- a/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
+++ b/core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
@@ -37,6 +37,7 @@ class CityInfoConquestFunctions(val city: CityInfo){
             for (building in cityConstructions.getBuiltBuildings()) {
                 when {
                     building.hasUnique("Never destroyed when the city is captured") || building.isWonder -> continue
+                    building.hasUnique("Indicates the capital city") -> continue // Palace needs to stay a just a bit longer so moveToCiv isn't confused
                     building.hasUnique("Destroyed when the city is captured") ->
                         cityConstructions.removeBuilding(building.name)
                     else -> {

From 807f17556777b267ed38c48be7500396c30698bf Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Sat, 18 Sep 2021 23:02:35 +0300
Subject: [PATCH 2/2] 3.16.15-patch2

---
 buildSrc/src/main/kotlin/BuildConfig.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index 1d696bf7e3..2c3d0de9b2 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -3,8 +3,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.5.30"
     const val appName = "Unciv"
-    const val appCodeNumber = 626
-    const val appVersion = "3.16.15-patch1"
+    const val appCodeNumber = 627
+    const val appVersion = "3.16.15-patch2"
 
     const val gdxVersion = "1.10.0"
     const val roboVMVersion = "2.3.1"