Merge pull request #103 from ipsvn/master

fix bad logic with fallback announcer config option
B3none · Mar 30, 2024 · 5a43804 · 5a43804
2 parents e9c88ba + 4c0b856
commit 5a43804
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/RetakesPlugin/Modules/Configs/RetakesConfigData.cs b/RetakesPlugin/Modules/Configs/RetakesConfigData.cs
@@ -18,5 +18,5 @@ public class RetakesConfigData
     public string QueuePriorityFlag { get; set; } = "@css/vip";
     public bool IsDebugMode { get; set; } = false;
     public bool ShouldForceEvenTeamsWhenPlayerCountIsMultipleOf10 { get; set; } = true;
-    public bool EnableFallbackBombsiteAnnouncement { get; set; }
+    public bool EnableFallbackBombsiteAnnouncement { get; set; } = true;
 }
diff --git a/RetakesPlugin/RetakesPlugin.cs b/RetakesPlugin/RetakesPlugin.cs
@@ -629,7 +629,8 @@ public HookResult OnRoundStart(EventRoundStart @event, GameEventInfo info)
 
         _planter = _spawnManager.HandleRoundSpawns(_currentBombsite, _gameManager.QueueManager.ActivePlayers);
 
-        if (_retakesConfig?.RetakesConfigData?.EnableFallbackBombsiteAnnouncement is true or null)
+        if (!RetakesConfig.IsLoaded(_retakesConfig) ||
+            _retakesConfig!.RetakesConfigData!.EnableFallbackBombsiteAnnouncement)
         {
             AnnounceBombsite(_currentBombsite);
         }