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

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

@@ -78,11 +78,38 @@ namespace Content.Client.GameObjects.Components
base.HandleComponentState(curState, nextState); base.HandleComponentState(curState, nextState);
if (!(curState is DoAfterComponentState state)) if (!(curState is DoAfterComponentState state))
return; return;
var toRemove = new List<ClientDoAfter>();
_doAfters.Clear(); foreach (var (id, doAfter) in _doAfters)
{
var found = false;
foreach (var clientdoAfter in state.DoAfters)
{
if (clientdoAfter.ID == id)
{
found = true;
break;
}
}
if (!found)
{
toRemove.Add(doAfter);
}
}
foreach (var doAfter in toRemove)
{
Remove(doAfter);
}
foreach (var doAfter in state.DoAfters) foreach (var doAfter in state.DoAfters)
{ {
if (_doAfters.ContainsKey(doAfter.ID))
continue;
_doAfters.Add(doAfter.ID, doAfter); _doAfters.Add(doAfter.ID, doAfter);
} }

4
Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
View File

@@ -75,8 +75,8 @@ namespace Content.Client.GameObjects.EntitySystems.DoAfter
{ {
if (comp.Gui != null) if (comp.Gui != null)
comp.Gui.FirstDraw = true; comp.Gui.FirstDraw = true;
return; continue;
} }
var range = (comp.Owner.Transform.WorldPosition - _attachedEntity.Transform.WorldPosition).Length + 0.01f; var range = (comp.Owner.Transform.WorldPosition - _attachedEntity.Transform.WorldPosition).Length + 0.01f;

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

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