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

Fix DoAfters staying (#2222)

Browse Source 
return moment

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2020-10-11 07:43:07 +11:00
committed by GitHub
parent ffbc4f355e
commit 8ccb931536
3 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs
View File

@@ -110,7 +110,6 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
// Non-exposed data fields
private bool _isBroken = false;
private float _interactRange;
private DoAfterSystem _doAfterSystem;
private AudioSystem _audioSystem;
public override void Initialize()
@@ -118,7 +117,6 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
base.Initialize();
_audioSystem = EntitySystem.Get<AudioSystem>();
_doAfterSystem = EntitySystem.Get<DoAfterSystem>();
_interactRange = SharedInteractionSystem.InteractionRange / 2;
}
@@ -213,7 +211,7 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
NeedHand = true
};
var result = await _doAfterSystem.DoAfter(doAfterEventArgs);
var result = await EntitySystem.Get<DoAfterSystem>().DoAfter(doAfterEventArgs);
if (result != DoAfterStatus.Cancelled)
{