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

Replace usages of ISharedNotifyManager and IServerNotifyManager with extension methods (#1965)

Browse Source 
* Replace usages of ISharedNotifyManager and IServerNotifyManager with extension methods

* Remove redundant code
This commit is contained in:
DrSmugleaf
2020-09-01 12:34:53 +02:00
committed by GitHub
parent 14259ed920
commit 8f9ed2f562
53 changed files with 247 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,11 +3,10 @@ using System;
using System.Linq;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces;
using Content.Server.Mobs;
using Content.Server.Utility;
using Content.Shared.GameObjects.Components.Instruments;
using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Interfaces;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Server.GameObjects;
using Robust.Server.GameObjects.Components.UserInterface;
@@ -38,7 +37,6 @@ namespace Content.Server.GameObjects.Components.Instruments
IUse,
IThrown
{
[Dependency] private readonly IServerNotifyManager _notifyManager = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
private static readonly TimeSpan OneSecAgo = TimeSpan.FromSeconds(-1);
@@ -166,11 +164,11 @@ namespace Content.Server.GameObjects.Components.Instruments
switch (_laggedBatches)
{
case (int) (MaxMidiLaggedBatches * (1 / 3d)) + 1:
_notifyManager.PopupMessage(Owner, InstrumentPlayer.AttachedEntity,
Owner.PopupMessage(InstrumentPlayer.AttachedEntity,
"Your fingers are beginning to a cramp a little!");
break;
case (int) (MaxMidiLaggedBatches * (2 / 3d)) + 1:
_notifyManager.PopupMessage(Owner, InstrumentPlayer.AttachedEntity,
Owner.PopupMessage(InstrumentPlayer.AttachedEntity,
"Your fingers are seriously cramping up!");
break;
}
@@ -333,7 +331,7 @@ namespace Content.Server.GameObjects.Components.Instruments
InstrumentPlayer = null;
_notifyManager.PopupMessage(Owner, mob, "Your fingers cramp up from playing!");
Owner.PopupMessage(mob, "Your fingers cramp up from playing!");
}
_timer += delta;