From c627280c2f6d6330f40fbbbb5d26cf02e382b15b Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Wed, 10 Aug 2022 18:15:44 +1200
Subject: [PATCH] Fix events.enabled (#10345)

---
 .../BasicStationEventSchedulerSystem.cs          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
index a6d101f6d4..a498579de9 100644
--- a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -8,7 +8,6 @@ using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Timing;
 
 namespace Content.Server.StationEvents
 {
@@ -43,16 +42,21 @@ namespace Content.Server.StationEvents
 
             // Can't just check debug / release for a default given mappers need to use release mode
             // As such we'll always pause it by default.
-            _configurationManager.OnValueChanged(CCVars.EventsEnabled, value => RuleAdded = value, true);
+            _configurationManager.OnValueChanged(CCVars.EventsEnabled, SetEnabled, true);
 
             SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
         }
 
-        public override void Started()
+        public override void Shutdown()
         {
-            if (!_configurationManager.GetCVar(CCVars.EventsEnabled))
-                RuleAdded = false;
+            base.Shutdown();
+            _configurationManager.UnsubValueChanged(CCVars.EventsEnabled, SetEnabled);
         }
+
+        public bool EventsEnabled { get; private set; }
+        private void SetEnabled(bool value) => EventsEnabled = value;
+
+        public override void Started() { }
         public override void Ended() { }
 
         /// <summary>
@@ -86,7 +90,7 @@ namespace Content.Server.StationEvents
         {
             base.Update(frameTime);
 
-            if (!RuleStarted)
+            if (!RuleStarted || !EventsEnabled)
                 return;
 
             if (_timeUntilNextEvent > 0)