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

Enable nullability in Content.Server (#3685)

Browse Source
This commit is contained in:
DrSmugleaf
2021-03-16 15:50:20 +01:00
committed by GitHub
parent 90fec0ed24
commit a5ade526b7
306 changed files with 1616 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs
View File

@@ -1,15 +1,11 @@
using System;
using System.Collections.Generic;
using Content.Server.GameTicking;
using Content.Server.Interfaces.GameTicking;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Reflection;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
@@ -36,17 +32,6 @@ namespace Content.Server.GameObjects.Components.Markers
[DataField("chance")]
public float Chance { get; set; } = 1.0f;
public IEnumerable<Type> GameRules
{
get
{
foreach (var rule in _gameRules)
{
yield return _reflectionManager.GetType(rule);
}
}
}
private void RuleAdded(GameRuleAddedEventArgs obj)
{
if(_gameRules.Contains(obj.GameRule.GetType().Name))
@@ -61,7 +46,7 @@ namespace Content.Server.GameObjects.Components.Markers
return;
}
foreach (var rule in GameRules)
foreach (var rule in _gameRules)
{
if (!_gameTicker.HasGameRule(rule)) continue;
Spawn();