cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Throttle MagicMirror do_afters (#23867) 

Doesn't fix the gross network spam but that's for later.

(cherry picked from commit 34d2330604a8ba5906ad1d5d4fd87f3c942523cd)
This commit is contained in:
metalgearsloth 2024-01-11 11:08:42 +11:00 committed by Debug
parent b737fcd694
commit c720d5fd77
No known key found for this signature in database
GPG Key ID: 271270A74EF9C350
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/MagicMirror/MagicMirrorComponent.cs
View File

@ -1,3 +1,4 @@
using Content.Shared.DoAfter;
using Content.Shared.Humanoid;
using Robust.Shared.Audio;
@ -9,6 +10,9 @@ namespace Content.Server.MagicMirror;
[RegisterComponent]
public sealed partial class MagicMirrorComponent : Component
{
[DataField]
public DoAfterId? DoAfter;
/// <summary>
/// Magic mirror target, used for validating UI messages.
/// </summary>

25
Content.Server/MagicMirror/MagicMirrorSystem.cs
View File

@ -78,6 +78,9 @@ public sealed class MagicMirrorSystem : EntitySystem
if (component.Target is not { } target || message.Session.AttachedEntity is not { } user)
return;
_doAfterSystem.Cancel(component.DoAfter);
component.DoAfter = null;
var doAfter = new MagicMirrorSelectDoAfterEvent()
{
Category = message.Category,
@ -94,8 +97,9 @@ public sealed class MagicMirrorSystem : EntitySystem
BreakOnUserMove = true,
BreakOnWeightlessMove = false,
NeedHand = true
});
}, out var doAfterId);
component.DoAfter = doAfterId;
_audio.PlayPvs(component.ChangeHairSound, uid);
}
@ -131,6 +135,9 @@ public sealed class MagicMirrorSystem : EntitySystem
if (component.Target is not { } target || message.Session.AttachedEntity is not { } user)
return;
_doAfterSystem.Cancel(component.DoAfter);
component.DoAfter = null;
var doAfter = new MagicMirrorChangeColorDoAfterEvent()
{
Category = message.Category,
@ -146,7 +153,9 @@ public sealed class MagicMirrorSystem : EntitySystem
BreakOnUserMove = true,
BreakOnWeightlessMove = false,
NeedHand = true
});
}, out var doAfterId);
component.DoAfter = doAfterId;
}
private void OnChangeColorDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorChangeColorDoAfterEvent args)
{
@ -181,6 +190,9 @@ public sealed class MagicMirrorSystem : EntitySystem
if (component.Target is not { } target || message.Session.AttachedEntity is not { } user)
return;
_doAfterSystem.Cancel(component.DoAfter);
component.DoAfter = null;
var doAfter = new MagicMirrorRemoveSlotDoAfterEvent()
{
Category = message.Category,
@ -196,8 +208,9 @@ public sealed class MagicMirrorSystem : EntitySystem
BreakOnUserMove = true,
BreakOnWeightlessMove = false,
NeedHand = true
});
}, out var doAfterId);
component.DoAfter = doAfterId;
_audio.PlayPvs(component.ChangeHairSound, uid);
}
@ -236,6 +249,9 @@ public sealed class MagicMirrorSystem : EntitySystem
if (message.Session.AttachedEntity == null)
return;
_doAfterSystem.Cancel(component.DoAfter);
component.DoAfter = null;
var doAfter = new MagicMirrorAddSlotDoAfterEvent()
{
Category = message.Category,
@ -249,8 +265,9 @@ public sealed class MagicMirrorSystem : EntitySystem
BreakOnUserMove = true,
BreakOnWeightlessMove = false,
NeedHand = true
});
}, out var doAfterId);
component.DoAfter = doAfterId;
_audio.PlayPvs(component.ChangeHairSound, uid);
}
private void OnAddSlotDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorAddSlotDoAfterEvent args)