Merge pull request #220 from TGRCdev/stinger-fix

Fixed stinger grenades causing massive lag spikes
impstation · Sep 7, 2024 · f89d488 · f89d488
2 parents ce00dc5 + 152c8b8
commit f89d488
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Explosion.Components;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Explosion.EntitySystems;
 
@@ -114,8 +115,12 @@ public override void Update(float frameTime)
                         RaiseLocalEvent(uid, ref ev);
                     }
                 }
-                // delete the empty shell of the clusterbomb
-                Del(uid);
+                // move the exploded grenade to null space
+                if (TryComp(uid, out TransformComponent? xform))
+                    _transformSystem.DetachEntity(uid, xform);
+
+                // wait a second before deleting to prevent a flood of errors from projectiles
+                Timer.Spawn(TimeSpan.FromSeconds(1), () => QueueDel(uid));
             }
         }
     }

diff --git a/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs b/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs
@@ -14,4 +14,9 @@ public abstract partial class BaseEmitSoundComponent : Component
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField(required: true)]
     public SoundSpecifier? Sound;
+
+    [AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
+    public bool Detach = false;
 }
diff --git a/Content.Shared/Sound/SharedEmitSoundSystem.cs b/Content.Shared/Sound/SharedEmitSoundSystem.cs
@@ -143,12 +143,24 @@ protected void TryEmitSound(EntityUid uid, BaseEmitSoundComponent component, Ent
 
         if (predict)
         {
-            _audioSystem.PlayPredicted(component.Sound, uid, user);
+            if (component.Detach)
+            {
+                if (TryComp(uid, out TransformComponent? xform))
+                    _audioSystem.PlayPredicted(component.Sound, xform.Coordinates, user);
+            }
+            else
+                _audioSystem.PlayPredicted(component.Sound, uid, user);
         }
         else if (_netMan.IsServer)
         {
             // don't predict sounds that client couldn't have played already
-            _audioSystem.PlayPvs(component.Sound, uid);
+            if (component.Detach)
+            {
+                if (TryComp(uid, out TransformComponent? xform))
+                    _audioSystem.PlayPvs(component.Sound, xform.Coordinates);
+            }
+            else
+                _audioSystem.PlayPvs(component.Sound, uid);
         }
     }
 

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
@@ -135,6 +135,7 @@
   - type: EmitSoundOnTrigger
     sound:
       path: "/Audio/Effects/flash_bang.ogg"
+    detach: true
   - type: SpawnOnTrigger
     proto: GrenadeFlashEffect
   - type: TimerTriggerVisuals