tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

22
Content.Client/GameObjects/Components/SubFloorHideComponent.cs
View File

@@ -1,5 +1,7 @@
using Robust.Client.GameObjects;
using System.Diagnostics;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Utility;
namespace Content.Client.GameObjects.Components
{
@@ -12,7 +14,8 @@ namespace Content.Client.GameObjects.Components
[RegisterComponent]
public sealed class SubFloorHideComponent : Component
{
private SnapGridComponent _snapGridComponent;
[ComponentDependency(nameof(OnAddSnapGrid))]
private SnapGridComponent? _snapGridComponent;
/// <inheritdoc />
public override string Name => "SubFloorHide";
@@ -30,7 +33,6 @@ namespace Content.Client.GameObjects.Components
{
base.Startup();
_snapGridComponent.OnPositionChanged += SnapGridOnPositionChanged;
Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new SubFloorHideDirtyEvent(Owner));
}
@@ -39,13 +41,23 @@ namespace Content.Client.GameObjects.Components
{
base.Shutdown();
if(Owner.Transform.Running == false)
if (Owner.Transform.Running == false)
return;
_snapGridComponent.OnPositionChanged -= SnapGridOnPositionChanged;
if (_snapGridComponent != null)
{
_snapGridComponent.OnPositionChanged -= SnapGridOnPositionChanged;
}
Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new SubFloorHideDirtyEvent(Owner));
}
private void OnAddSnapGrid()
{
DebugTools.AssertNotNull(_snapGridComponent);
_snapGridComponent!.OnPositionChanged += SnapGridOnPositionChanged;
}
private void SnapGridOnPositionChanged()
{
Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new SubFloorHideDirtyEvent(Owner));