From 8ee36d43d7e84daacec3c9a77f003b66baa3e17f Mon Sep 17 00:00:00 2001
From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Date: Wed, 29 Sep 2021 05:19:49 +0200
Subject: [PATCH] Allow Deciv Redux start with >0 City States (#5348)

---
 core/src/com/unciv/logic/civilization/CityStateFunctions.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/com/unciv/logic/civilization/CityStateFunctions.kt b/core/src/com/unciv/logic/civilization/CityStateFunctions.kt
index 6f8917e1b3..efb8615a59 100644
--- a/core/src/com/unciv/logic/civilization/CityStateFunctions.kt
+++ b/core/src/com/unciv/logic/civilization/CityStateFunctions.kt
@@ -49,7 +49,7 @@ class CityStateFunctions(val civInfo: CivilizationInfo) {
         // Mercantile bonus resources
         if (allPossibleBonuses.any { it.isOfType(UniqueType.CityStateUniqueLuxury) }
             || (fallback && cityStateType == CityStateType.Mercantile)) { // Fallback for badly defined Eras.json
-            civInfo.cityStateResource = allMercantileResources.random()
+            civInfo.cityStateResource = allMercantileResources.randomOrNull()
         }
 
         // Unique unit for militaristic city-states