From bed38f75e7d0116f6007ec3755379b1ff3c9af0e Mon Sep 17 00:00:00 2001
From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Date: Wed, 4 Aug 2021 17:10:34 +0200
Subject: [PATCH] Allow civ-unique buildings to be created by startingEra
 (#4756)

---
 core/src/com/unciv/logic/city/CityInfo.kt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt
index f2a417a3e6..d8494e262c 100644
--- a/core/src/com/unciv/logic/city/CityInfo.kt
+++ b/core/src/com/unciv/logic/city/CityInfo.kt
@@ -120,9 +120,11 @@ class CityInfo {
 
         // Add buildings and pop we get from starting in this era
         if (startingEra in ruleset.eras) {
-            for (building in ruleset.eras[startingEra]!!.settlerBuildings) {
-                if (ruleset.buildings[building]!!.isBuildable(cityConstructions))
-                    cityConstructions.addBuilding(civInfo.getEquivalentBuilding(building).name)
+            for (buildingName in ruleset.eras[startingEra]!!.settlerBuildings) {
+                val building = ruleset.buildings[buildingName] ?: continue
+                val uniqueBuilding = civInfo.getEquivalentBuilding(building)
+                if (uniqueBuilding.isBuildable(cityConstructions))
+                    cityConstructions.addBuilding(uniqueBuilding.name)
             }
         }