From 677a4901ca0bda5aca765bc71b96866afe6d1ef2 Mon Sep 17 00:00:00 2001
From: metalgearsloth <comedian_vs_clown@hotmail.com>
Date: Mon, 14 Oct 2024 15:11:11 +1100
Subject: [PATCH] Make TryQueueDel work as expected on client

---
 Robust.Client/GameObjects/ClientEntityManager.cs | 9 +++++++++
 Robust.Shared/GameObjects/EntityManager.cs       | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Robust.Client/GameObjects/ClientEntityManager.cs b/Robust.Client/GameObjects/ClientEntityManager.cs
index 3b33663a8c0..5f44d9f3d54 100644
--- a/Robust.Client/GameObjects/ClientEntityManager.cs
+++ b/Robust.Client/GameObjects/ClientEntityManager.cs
@@ -4,6 +4,7 @@
 using Robust.Client.GameStates;
 using Robust.Client.Player;
 using Robust.Client.Timing;
+using Robust.Client.UserInterface;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
@@ -73,6 +74,14 @@ public override void DirtyEntity(EntityUid uid, MetaDataComponent? meta = null)
                 base.DirtyEntity(uid, meta);
         }
 
+        public override bool TryQueueDeleteEntity(EntityUid? uid)
+        {
+            if (uid == null || !IsClientSide(uid.Value))
+                return false;
+
+            return base.TryQueueDeleteEntity(uid);
+        }
+
         public override void QueueDeleteEntity(EntityUid? uid)
         {
             if (uid == null || uid == EntityUid.Invalid)
diff --git a/Robust.Shared/GameObjects/EntityManager.cs b/Robust.Shared/GameObjects/EntityManager.cs
index 6aa976d10b9..85026a31429 100644
--- a/Robust.Shared/GameObjects/EntityManager.cs
+++ b/Robust.Shared/GameObjects/EntityManager.cs
@@ -485,7 +485,7 @@ public virtual void Dirty<T1, T2, T3, T4>(Entity<T1, T2, T3, T4> ent, MetaDataCo
             ent.Comp4.LastModifiedTick = CurrentTick;
         }
 
-        public bool TryQueueDeleteEntity(EntityUid? uid)
+        public virtual bool TryQueueDeleteEntity(EntityUid? uid)
         {
             if (uid == null)
                 return false;