fix announcer not being set on startup

Simple-Station · Jul 12, 2024 · 781ca6b · 781ca6b
1 parent 34a85e0
commit 781ca6b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Content.Server/Announcements/Systems/AnnouncerSystem.Announcer.cs b/Content.Server/Announcements/Systems/AnnouncerSystem.Announcer.cs
@@ -11,6 +11,15 @@ namespace Content.Server.Announcements.Systems;
 public sealed partial class AnnouncerSystem
 {
     private void OnRoundRestarting(RoundRestartCleanupEvent ev)
+    {
+        NewAnnouncer();
+    }
+
+
+    /// <summary>
+    ///     Sets the announcer to a random one or the CVar
+    /// </summary>
+    private void NewAnnouncer()
     {
         var announcer = _config.GetCVar(CCVars.Announcer);
         if (string.IsNullOrEmpty(announcer))
@@ -19,11 +28,9 @@ private void OnRoundRestarting(RoundRestartCleanupEvent ev)
             SetAnnouncer(announcer);
     }
 
-
     /// <summary>
-    ///     Picks a random announcer
+    ///     Picks a random announcer prototype following blacklists
     /// </summary>
-    /// <remarks>Probably not very useful for any other system</remarks>
     public AnnouncerPrototype PickAnnouncer()
     {
         var list = _proto.Index<WeightedRandomPrototype>(_config.GetCVar(CCVars.AnnouncerList));

diff --git a/Content.Server/Announcements/Systems/AnnouncerSystem.cs b/Content.Server/Announcements/Systems/AnnouncerSystem.cs
@@ -25,7 +25,7 @@ public override void Initialize()
     {
         base.Initialize();
 
-        PickAnnouncer();
+        NewAnnouncer();
 
         _config.OnValueChanged(CCVars.Announcer, SetAnnouncer);