Resolved #1433 - city-states immediately destroy cities upon conquering

core/src/com/unciv/logic/battle/Battle.kt

@@ -249,6 +249,11 @@ class Battle(val gameInfo:GameInfo) {
         }
         city.hasJustBeenConquered = true
 
+        if (!attackerCiv.isMajorCiv()){
+            city.destroyCity()
+            return
+        }
+
         if (attackerCiv.isPlayerCivilization())
             attackerCiv.popupAlerts.add(PopupAlert(AlertType.CityConquered, city.name))
         else {

core/src/com/unciv/logic/city/CityInfo.kt

@@ -334,9 +334,6 @@ class CityInfo {
 
     /** This happens when we either puppet OR annex, basically whenever we conquer a city and don't liberate it */
     fun puppetCity(conqueringCiv: CivilizationInfo) {
-        if (!conqueringCiv.isMajorCiv()){
-            destroyCity()
-        }
 
         val oldCiv = civInfo
         moveToCiv(conqueringCiv)