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

Throttle MagicMirror do_afters (#23867)

Browse Source 
Doesn't fix the gross network spam but that's for later.
This commit is contained in:
metalgearsloth
2024-01-11 11:08:42 +11:00
committed by GitHub
parent a35c91fc76
commit 34d2330604
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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)