From 55a0e57ea31608ca358cb0c5e374999e1a8cc5bf Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 1 Jun 2023 15:36:37 +1000
Subject: [PATCH] Fix predicted entity deletion for damage markers (#17015)

---
 .../Weapons/Marker/SharedDamageMarkerSystem.cs  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs b/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs
index 0f6fc34aca..16e0a9a1d7 100644
--- a/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs
+++ b/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Damage;
 using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Melee.Events;
+using Robust.Shared.Network;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Timing;
 
@@ -9,6 +10,7 @@ namespace Content.Shared.Weapons.Marker;
 public abstract class SharedDamageMarkerSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly INetManager _netManager = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
 
     public override void Initialize()
@@ -69,13 +71,16 @@ public abstract class SharedDamageMarkerSystem : EntitySystem
         component.Amount--;
         Dirty(marker);
 
-        if (component.Amount <= 0)
+        if (_netManager.IsServer)
         {
-            QueueDel(uid);
-        }
-        else
-        {
-            Dirty(component);
+            if (component.Amount <= 0)
+            {
+                QueueDel(uid);
+            }
+            else
+            {
+                Dirty(component);
+            }
         }
     }
 }