Skip to content

Commit

Permalink
Merge pull request #1609 from deltanedas/event-fix-ops
Browse files Browse the repository at this point in the history
Fix mid round antags not starting (#28523)
  • Loading branch information
deltanedas authored Aug 12, 2024
2 parents 01f5f30 + 1d31ae1 commit c69ab9e
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Content.Server/StationEvents/Events/StationEventSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,11 @@ public override void Update(float frameTime)
if (!GameTicker.IsGameRuleAdded(uid, ruleData))
continue;

if (stationEvent.EndTime != null && Timing.CurTime >= stationEvent.EndTime && GameTicker.IsGameRuleActive(uid, ruleData))
if (!GameTicker.IsGameRuleActive(uid, ruleData) && !HasComp<DelayedStartRuleComponent>(uid))
{
GameTicker.StartGameRule(uid, ruleData);
}
else if (stationEvent.EndTime != null && Timing.CurTime >= stationEvent.EndTime && GameTicker.IsGameRuleActive(uid, ruleData))
{
GameTicker.EndGameRule(uid, ruleData);
}
Expand Down

0 comments on commit c69ab9e

Please sign in to comment.