Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Separate game rule enabling and game rule starting (#6168)

Browse Source
This commit is contained in:
mirrorcult
2022-02-15 20:06:28 -07:00
committed by GitHub
parent e427381be6
commit 3abc7a443e
13 changed files with 125 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
View File

@@ -1,10 +1,6 @@
using Content.Server.GameTicking;
using Content.Server.Spawners.Components;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using Robust.Shared.Random;
namespace Content.Server.Spawners.EntitySystems
@@ -19,7 +15,7 @@ namespace Content.Server.Spawners.EntitySystems
{
base.Initialize();
SubscribeLocalEvent<GameRuleAddedEvent>(OnRuleAdded);
SubscribeLocalEvent<GameRuleStartedEvent>(OnRuleStarted);
SubscribeLocalEvent<ConditionalSpawnerComponent, MapInitEvent>(OnCondSpawnMapInit);
SubscribeLocalEvent<RandomSpawnerComponent, MapInitEvent>(OnRandSpawnMapInit);
}
@@ -35,15 +31,15 @@ namespace Content.Server.Spawners.EntitySystems
EntityManager.QueueDeleteEntity(uid);
}
private void OnRuleAdded(GameRuleAddedEvent args)
private void OnRuleStarted(GameRuleStartedEvent args)
{
foreach (var spawner in EntityManager.EntityQuery<ConditionalSpawnerComponent>())
{
RuleAdded(spawner, args);
RuleStarted(spawner, args);
}
}
public void RuleAdded(ConditionalSpawnerComponent component, GameRuleAddedEvent obj)
public void RuleStarted(ConditionalSpawnerComponent component, GameRuleStartedEvent obj)
{
if(component.GameRules.Contains(obj.Rule.ID))
Spawn(component);
@@ -59,7 +55,7 @@ namespace Content.Server.Spawners.EntitySystems
foreach (var rule in component.GameRules)
{
if (!_ticker.HasGameRule(rule)) continue;
if (!_ticker.GameRuleStarted(rule)) continue;
Spawn(component);
return;
}