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

14
Content.Server/GameObjects/Components/ConfigurationComponent.cs
View File

@@ -24,7 +24,7 @@ namespace Content.Server.GameObjects.Components
[ComponentReference(typeof(SharedConfigurationComponent))]
public class ConfigurationComponent : SharedConfigurationComponent, IInteractUsing, ISerializationHooks
{
[ViewVariables] private BoundUserInterface UserInterface => Owner.GetUIOrNull(ConfigurationUiKey.Key);
[ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(ConfigurationUiKey.Key);
[DataField("keys")] private List<string> _keys = new();
@@ -65,7 +65,7 @@ namespace Content.Server.GameObjects.Components
}
}
public string GetConfig(string name)
public string? GetConfig(string name)
{
return _config.GetValueOrDefault(name);
}
@@ -78,7 +78,7 @@ namespace Content.Server.GameObjects.Components
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
{
if (UserInterface == null || !eventArgs.User.TryGetComponent(out IActorComponent actor))
if (UserInterface == null || !eventArgs.User.TryGetComponent(out IActorComponent? actor))
return false;
if (!eventArgs.Using.TryGetComponent<ToolComponent>(out var tool))
@@ -110,7 +110,7 @@ namespace Content.Server.GameObjects.Components
SendMessage(new ConfigUpdatedComponentMessage(config));
}
}
}
private void UpdateUserInterface()
{
@@ -120,8 +120,8 @@ namespace Content.Server.GameObjects.Components
private void OpenUserInterface(IActorComponent actor)
{
UpdateUserInterface();
UserInterface.Open(actor.playerSession);
UserInterface.SendMessage(new ValidationUpdateMessage(_validation.ToString()), actor.playerSession);
UserInterface?.Open(actor.playerSession);
UserInterface?.SendMessage(new ValidationUpdateMessage(_validation.ToString()), actor.playerSession);
}
private static void FillConfiguration<T>(List<string> list, Dictionary<string, T> configuration, T value){
@@ -150,7 +150,7 @@ namespace Content.Server.GameObjects.Components
protected override void Activate(IEntity user, ConfigurationComponent component)
{
if (user.TryGetComponent(out IActorComponent actor))
if (user.TryGetComponent(out IActorComponent? actor))
{
component.OpenUserInterface(actor);
}