From 237e286d4d4253ad3b5e81def53d977beadc036e Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Fri, 18 Jul 2025 14:09:44 +0300
Subject: [PATCH] getFlag returns 0 and does not crash if the flag does is not
 set

---
 .../com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
index 02a39169a9..94ea52db6c 100644
--- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
+++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
@@ -543,7 +543,8 @@ class DiplomacyManager() : IsPartOfGameInfoSerialization {
         flagsCountdown[flag.name] = amount
     }
 
-    @Readonly fun getFlag(flag: DiplomacyFlags) = flagsCountdown[flag.name]!!
+    /** 0 indicates 'flag does not exist' */
+    @Readonly fun getFlag(flag: DiplomacyFlags) = flagsCountdown[flag.name] ?: 0
     fun removeFlag(flag: DiplomacyFlags) {
         flagsCountdown.remove(flag.name)
     }