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

2
Content.Server/GameObjects/Components/MachineLinking/SignalLinkerComponent.cs
View File

@@ -9,7 +9,7 @@ namespace Content.Server.GameObjects.Components.MachineLinking
public override string Name => "SignalLinker";
[ViewVariables]
public SignalTransmitterComponent Link { get; set; }
public SignalTransmitterComponent? Link { get; set; }
public override void Initialize()
{

14
Content.Server/GameObjects/Components/MachineLinking/SignalReceiverComponent.cs
View File

@@ -6,10 +6,7 @@ using Content.Shared.Interfaces;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
namespace Content.Server.GameObjects.Components.MachineLinking
{
@@ -18,18 +15,11 @@ namespace Content.Server.GameObjects.Components.MachineLinking
{
public override string Name => "SignalReceiver";
private List<SignalTransmitterComponent> _transmitters;
private readonly List<SignalTransmitterComponent> _transmitters = new();
[DataField("maxTransmitters")]
private int? _maxTransmitters = default;
public override void Initialize()
{
base.Initialize();
_transmitters = new List<SignalTransmitterComponent>();
}
public void DistributeSignal<T>(T state)
{
foreach (var comp in Owner.GetAllComponents<ISignalReceiver<T>>())
@@ -78,7 +68,7 @@ namespace Content.Server.GameObjects.Components.MachineLinking
/// <param name="user"></param>
/// <param name="transmitter"></param>
/// <returns></returns>
public bool Interact(IEntity user, SignalTransmitterComponent transmitter)
public bool Interact(IEntity user, SignalTransmitterComponent? transmitter)
{
if (transmitter == null)
{

5
Content.Server/GameObjects/Components/MachineLinking/SignalTransmitterComponent.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Server.GameObjects.Components.MachineLinking
{
public override string Name => "SignalTransmitter";
private List<SignalReceiverComponent> _unresolvedReceivers;
private List<SignalReceiverComponent>? _unresolvedReceivers = new();
private List<SignalReceiverComponent> _receivers = new();
/// <summary>
@@ -74,6 +74,7 @@ namespace Content.Server.GameObjects.Components.MachineLinking
{
receiver.Subscribe(this);
}
_unresolvedReceivers = null;
}
}
@@ -112,7 +113,7 @@ namespace Content.Server.GameObjects.Components.MachineLinking
_receivers.Remove(receiver);
}
public SignalTransmitterComponent GetSignal(IEntity user)
public SignalTransmitterComponent GetSignal(IEntity? user)
{
if (user != null)
{