tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable nullability in Content.Shared (#3626)

Browse Source 
* Enable nullability in Content.Shared

* Fix null errors in server

* aye github i swear on me mom
This commit is contained in:
DrSmugleaf
2021-03-15 21:55:49 +01:00
committed by GitHub
parent 04201e944c
commit 6f012cb9ad
31 changed files with 167 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs
View File

@@ -15,8 +15,6 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Network;
using Robust.Shared.Players;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
@@ -201,11 +199,11 @@ namespace Content.Server.GameObjects.Components.Instruments
{
if (_laggedBatches == (int) (maxMidiLaggedBatches * (1 / 3d) + 1))
{
Owner.PopupMessage(InstrumentPlayer.AttachedEntity,
InstrumentPlayer.AttachedEntity?.PopupMessage(
Loc.GetString("Your fingers are beginning to a cramp a little!"));
} else if (_laggedBatches == (int) (maxMidiLaggedBatches * (2 / 3d) + 1))
{
Owner.PopupMessage(InstrumentPlayer.AttachedEntity,
InstrumentPlayer.AttachedEntity?.PopupMessage(
Loc.GetString("Your fingers are seriously cramping up!"));
}
}
@@ -360,11 +358,11 @@ namespace Content.Server.GameObjects.Components.Instruments
stun.Stun(1);
Clean();
}
Owner.PopupMessage(mob, "Your fingers cramp up from playing!");
}
InstrumentPlayer = null;
Owner.PopupMessage(mob, "Your fingers cramp up from playing!");
}
_timer += delta;