Fix timing on BasticStationEvents

dasprino007 · Nov 12, 2024 · 83267fd · 83267fd
1 parent 84903f6
commit 83267fd
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -66,18 +66,15 @@ public override void Update(float frameTime)
 
                 if (Resolve(uid, ref nextEventComponent, false)) // If there is a nextEventComponent use the stashed event instead of running it directly.
                 {
+                    ResetTimer(eventScheduler);
                     TimeSpan nextEventTime = _timing.CurTime + TimeSpan.FromSeconds(eventScheduler.TimeUntilNextEvent);
                     if (!_event.TryGenerateRandomEvent(eventScheduler.ScheduledGameRules, out string? generatedEvent, nextEventTime) || generatedEvent == null)
-                    {
-                        ResetTimer(eventScheduler);
                         continue;
-                    }
                     // Cycle the stashed event with the new generated event and time.
                     string storedEvent= _next.UpdateNextEvent(nextEventComponent, generatedEvent, nextEventTime);
                     if (storedEvent == null || storedEvent == string.Empty) //If there was no stored event don't try to run it.
                         continue;
                     GameTicker.AddGameRule(storedEvent);
-                    ResetTimer(eventScheduler);
                     continue;
                 }
                 // DeltaV end events using NextEventComponent