Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

13
Content.Server/GameObjects/Components/RandomSpriteColorComponent.cs
View File

@@ -3,9 +3,7 @@ using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Server.GameObjects.Components
@@ -16,19 +14,14 @@ namespace Content.Server.GameObjects.Components
public override string Name => "RandomSpriteColor";
[DataField("selected")]
private string _selectedColor;
private string? _selectedColor;
[DataField("state")]
private string _baseState = "error";
[DataField("colors")] private Dictionary<string, Color> _colors = new();
[DataField("colors")] private readonly Dictionary<string, Color> _colors = new();
void IMapInit.MapInit()
{
if (_colors == null)
{
return;
}
var random = IoCManager.Resolve<IRobustRandom>();
_selectedColor = random.Pick(_colors.Keys);
UpdateColor();
@@ -43,7 +36,7 @@ namespace Content.Server.GameObjects.Components
private void UpdateColor()
{
if (Owner.TryGetComponent(out SpriteComponent spriteComponent) && _colors != null && _selectedColor != null)
if (Owner.TryGetComponent(out SpriteComponent? spriteComponent) && _selectedColor != null)
{
spriteComponent.LayerSetState(0, _baseState);
spriteComponent.LayerSetColor(0, _colors[_selectedColor]);