initialize NextEventComponent when created

dasprino007 · Nov 12, 2024 · 36f45be · 36f45be
1 parent 83267fd
commit 36f45be
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -33,6 +33,14 @@ protected override void Started(EntityUid uid, BasicStationEventSchedulerCompone
         {
             // A little starting variance so schedulers dont all proc at once.
             component.TimeUntilNextEvent = RobustRandom.NextFloat(component.MinimumTimeUntilFirstEvent, component.MinimumTimeUntilFirstEvent + 120);
+
+            // DeltaV - end init NextEventComp
+            NextEventComponent? nextEventComponent = null;
+            if (Resolve(uid, ref nextEventComponent, false)
+                && _event.TryGenerateRandomEvent(component.ScheduledGameRules, out string? firstEvent, TimeSpan.FromSeconds(component.TimeUntilNextEvent))
+                && firstEvent != null)
+                _next.UpdateNextEvent(nextEventComponent, firstEvent, TimeSpan.FromSeconds(component.TimeUntilNextEvent));
+            // DeltaV - end init NextEventComp
         }
 
         protected override void Ended(EntityUid uid, BasicStationEventSchedulerComponent component, GameRuleComponent gameRule,

diff --git a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
@@ -40,6 +40,14 @@ protected override void Started(EntityUid uid, RampingStationEventSchedulerCompo
         component.StartingChaos = component.MaxChaos / 10;
 
         PickNextEventTime(uid, component);
+
+        // DeltaV - end init NextEventComp
+        NextEventComponent? nextEventComponent = null;
+        if (Resolve(uid, ref nextEventComponent, false)
+            && _event.TryGenerateRandomEvent(component.ScheduledGameRules, out string? firstEvent, TimeSpan.FromSeconds(component.TimeUntilNextEvent))
+            && firstEvent != null)
+            _next.UpdateNextEvent(nextEventComponent, firstEvent, TimeSpan.FromSeconds(component.TimeUntilNextEvent));
+        // DeltaV - end init NextEventComp
     }
 
     public override void Update(float frameTime)