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

Update usages of ! is with is not (#2584)

Browse Source 
* Update usages of ! is with is not

* Content.IntegrationTests commit

* Content.Server commit

* Content.Shared commit

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
DrSmugleaf
2020-11-26 14:33:31 +01:00
committed by GitHub
parent a16ce4b7a5
commit 06b1939a60
75 changed files with 147 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Client/GameObjects/Components/DoAfterComponent.cs
View File

@@ -18,8 +18,8 @@ namespace Content.Client.GameObjects.Components
public IReadOnlyDictionary<byte, ClientDoAfter> DoAfters => _doAfters;
private readonly Dictionary<byte, ClientDoAfter> _doAfters = new Dictionary<byte, ClientDoAfter>();
public readonly List<(TimeSpan CancelTime, ClientDoAfter Message)> CancelledDoAfters =
public readonly List<(TimeSpan CancelTime, ClientDoAfter Message)> CancelledDoAfters =
new List<(TimeSpan CancelTime, ClientDoAfter Message)>();
public DoAfterGui? Gui { get; set; }
@@ -54,9 +54,9 @@ namespace Content.Client.GameObjects.Components
{
if (Gui != null && !Gui.Disposed)
return;
Gui = new DoAfterGui {AttachedEntity = Owner};
foreach (var (_, doAfter) in _doAfters)
{
Gui.AddDoAfter(doAfter);
@@ -76,15 +76,16 @@ namespace Content.Client.GameObjects.Components
public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
{
base.HandleComponentState(curState, nextState);
if (!(curState is DoAfterComponentState state))
if (curState is not DoAfterComponentState state)
return;
var toRemove = new List<ClientDoAfter>();
foreach (var (id, doAfter) in _doAfters)
{
var found = false;
foreach (var clientdoAfter in state.DoAfters)
{
if (clientdoAfter.ID == id)
@@ -109,10 +110,10 @@ namespace Content.Client.GameObjects.Components
{
if (_doAfters.ContainsKey(doAfter.ID))
continue;
_doAfters.Add(doAfter.ID, doAfter);
}
if (Gui == null || Gui.Disposed)
return;
@@ -132,7 +133,7 @@ namespace Content.Client.GameObjects.Components
_doAfters.Remove(clientDoAfter.ID);
var found = false;
for (var i = CancelledDoAfters.Count - 1; i >= 0; i--)
{
var cancelled = CancelledDoAfters[i];
@@ -167,11 +168,11 @@ namespace Content.Client.GameObjects.Components
if (!_doAfters.ContainsKey(id))
return;
var doAfterMessage = _doAfters[id];
currentTime ??= IoCManager.Resolve<IGameTiming>().CurTime;
CancelledDoAfters.Add((currentTime.Value, doAfterMessage));
Gui?.CancelDoAfter(id);
}
}
}
}