From db6031da829f252b62386a99578a702ed090deb3 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sat, 7 Mar 2020 23:06:34 +0200
Subject: [PATCH] Starting locations work again =)

---
 core/src/com/unciv/logic/GameStarter.kt | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/src/com/unciv/logic/GameStarter.kt b/core/src/com/unciv/logic/GameStarter.kt
index 1401be344e..6bbbf6ce1d 100644
--- a/core/src/com/unciv/logic/GameStarter.kt
+++ b/core/src/com/unciv/logic/GameStarter.kt
@@ -91,11 +91,6 @@ class GameStarter {
             gameInfo.civilizations.add(civ)
         }
 
-        // remove starting locations one we're done
-        for(tile in gameInfo.tileMap.values){
-            if(tile.improvement!=null && tile.improvement!!.startsWith("StartingLocation "))
-                tile.improvement=null
-        }
     }
 
     private fun addCivStartingUnits(gameInfo: GameInfo) {
@@ -104,6 +99,12 @@ class GameStarter {
                 gameInfo.civilizations.filter { !it.isBarbarian() },
                 gameInfo.tileMap)
 
+        // remove starting locations one we're done
+        for(tile in gameInfo.tileMap.values){
+            if(tile.improvement!=null && tile.improvement!!.startsWith("StartingLocation "))
+                tile.improvement=null
+        }
+
         // For later starting eras, or for civs like Polynesia with a different Warrior, we need different starting units
         fun getWarriorEquivalent(civ: CivilizationInfo): String {
             val availableMilitaryUnits = gameInfo.ruleSet.units.values.filter {
@@ -127,6 +128,7 @@ class GameStarter {
                 }
             }
         }
+
     }
 
     private fun getStartingLocations(civs:List<CivilizationInfo>, tileMap: TileMap): HashMap<CivilizationInfo, TileInfo> {