tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Turns GameTicker into an EntitySystem. (#4197)

Browse Source 
* GameTicker turned into an EntitySystem

* Turns ClientGameTicker into an EntitySystem, turn NetMessages into events

* Change event names to be more consistent with the rest.

* YAML linter uses the dummy gameticker CVar override.

* Fix game ticker initialization order

* Dummy ticker won't spawn players.

* Fix character creation test
This commit is contained in:
Vera Aguilera Puerto
2021-06-20 10:09:24 +02:00
committed by GitHub
parent 15fb554c28
commit d3a611164b
81 changed files with 1711 additions and 1990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
View File

@@ -12,7 +12,6 @@ namespace Content.Server.Spawners.Components
[RegisterComponent]
public class ConditionalSpawnerComponent : Component, IMapInit
{
[Dependency] private readonly IGameTicker _gameTicker = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!;
public override string Name => "ConditionalSpawner";
@@ -29,9 +28,9 @@ namespace Content.Server.Spawners.Components
[DataField("chance")]
public float Chance { get; set; } = 1.0f;
private void RuleAdded(GameRuleAddedEventArgs obj)
public void RuleAdded(GameRuleAddedEvent obj)
{
if(_gameRules.Contains(obj.GameRule.GetType().Name))
if(_gameRules.Contains(obj.Rule.GetType().Name))
Spawn();
}
@@ -45,7 +44,7 @@ namespace Content.Server.Spawners.Components
foreach (var rule in _gameRules)
{
if (!_gameTicker.HasGameRule(rule)) continue;
if (!EntitySystem.Get<GameTicker>().HasGameRule(rule)) continue;
Spawn();
return;
}
@@ -68,8 +67,6 @@ namespace Content.Server.Spawners.Components
public virtual void MapInit()
{
_gameTicker.OnRuleAdded += RuleAdded;
TrySpawn();
}
}