Make TryQueueDel work as expected on client

metalgearsloth · Oct 14, 2024 · 677a490 · 677a490
1 parent 9a7d1a3
commit 677a490
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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;