Fixed thaven emagging happening multiple times

impstation · Feb 10, 2025 · 41e92dc · 41e92dc
1 parent 6dc5f9a
commit 41e92dc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/Content.Server/_Impstation/Thaven/ThavenMoodSystem.cs b/Content.Server/_Impstation/Thaven/ThavenMoodSystem.cs
@@ -361,6 +361,9 @@ private void OnThavenMoodShutdown(EntityUid uid, ThavenMoodsComponent comp, Comp
     protected override void OnEmagged(EntityUid uid, ThavenMoodsComponent comp, ref GotEmaggedEvent args)
     {
         base.OnEmagged(uid, comp, ref args);
+        if(!args.Handled)
+            return;
+
         TryAddRandomMood(uid, WildcardDataset, comp);
     }
 }
diff --git a/Content.Shared/_Impstation/Thaven/SharedThavenMoodSystem.cs b/Content.Shared/_Impstation/Thaven/SharedThavenMoodSystem.cs
@@ -5,6 +5,8 @@ namespace Content.Shared._Impstation.Thaven;
 
 public abstract class SharedThavenMoodSystem : EntitySystem
 {
+    [Dependency] private readonly EmagSystem _emag = default!;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -13,6 +15,15 @@ public override void Initialize()
 
     protected virtual void OnEmagged(EntityUid uid, ThavenMoodsComponent comp, ref GotEmaggedEvent args)
     {
+        if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+            return;
+
+        if (_emag.CheckFlag(uid, EmagType.Interaction))
+            return;
+
+        if (uid == args.UserUid)
+            return;
+
         args.Handled = true;
     }
 }