Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Enable nullability in Content.Client (#3257)

Browse Source 
* Enable nullability in Content.Client

* Remove #nullable enable

* Merge fixes

* Remove Debug.Assert

* Merge fixes

* Fix build

* Fix build
This commit is contained in:
DrSmugleaf
2021-03-10 14:48:29 +01:00
committed by GitHub
parent 4f9bd4e802
commit 902aa128c2
270 changed files with 1774 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/GameObjects/Components/Body/BodyComponent.cs
View File

@@ -1,5 +1,4 @@
#nullable enable
using Content.Shared.GameObjects.Components.Body;
using Content.Shared.GameObjects.Components.Body;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;

3
Content.Client/GameObjects/Components/Body/Mechanism/MechanismComponent.cs
View File

@@ -1,5 +1,4 @@
#nullable enable
using Content.Shared.GameObjects.Components.Body.Mechanism;
using Content.Shared.GameObjects.Components.Body.Mechanism;
using Robust.Shared.GameObjects;
namespace Content.Client.GameObjects.Components.Body.Mechanism

3
Content.Client/GameObjects/Components/Body/Part/BodyPartComponent.cs
View File

@@ -1,5 +1,4 @@
#nullable enable
using Content.Shared.GameObjects.Components.Body.Part;
using Content.Shared.GameObjects.Components.Body.Part;
using Robust.Shared.GameObjects;
namespace Content.Client.GameObjects.Components.Body.Part

6
Content.Client/GameObjects/Components/Body/Scanner/BodyScannerBoundUserInterface.cs
View File

@@ -11,10 +11,10 @@ namespace Content.Client.GameObjects.Components.Body.Scanner
public class BodyScannerBoundUserInterface : BoundUserInterface
{
[ViewVariables]
private BodyScannerDisplay _display;
private BodyScannerDisplay? _display;
[ViewVariables]
private IEntity _entity;
private IEntity? _entity;
public BodyScannerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) { }
@@ -40,7 +40,7 @@ namespace Content.Client.GameObjects.Components.Body.Scanner
throw new ArgumentException($"Received an invalid entity with id {scannerState.Uid} for body scanner with id {Owner.Owner.Uid} at {Owner.Owner.Transform.MapPosition}");
}
_display.UpdateDisplay(_entity);
_display?.UpdateDisplay(_entity);
}
protected override void Dispose(bool disposing)

3
Content.Client/GameObjects/Components/Body/Scanner/BodyScannerDisplay.cs
View File

@@ -1,5 +1,4 @@
#nullable enable
using System.Linq;
using System.Linq;
using Content.Shared.GameObjects.Components.Body;
using Content.Shared.GameObjects.Components.Body.Mechanism;
using Content.Shared.GameObjects.Components.Body.Part;

3
Content.Client/GameObjects/Components/Body/Surgery/SurgeryBoundUserInterface.cs
View File

@@ -1,5 +1,4 @@
#nullable enable
using Content.Shared.GameObjects.Components.Body.Surgery;
using Content.Shared.GameObjects.Components.Body.Surgery;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;

4
Content.Client/GameObjects/Components/Body/Surgery/SurgeryWindow.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Client.GameObjects.Components.Body.Surgery
public delegate void OptionSelectedCallback(int selectedOptionData);
private readonly VBoxContainer _optionsBox;
private OptionSelectedCallback _optionSelectedCallback;
private OptionSelectedCallback? _optionSelectedCallback;
public SurgeryWindow()
{
@@ -65,7 +65,7 @@ namespace Content.Client.GameObjects.Components.Body.Surgery
{
if (args.Button.Parent is SurgeryButton surgery)
{
_optionSelectedCallback(surgery.CallbackData);
_optionSelectedCallback?.Invoke(surgery.CallbackData);
}
}
}