From 8b36043cf09c9337431f84f26c1188ecda5d0d8b Mon Sep 17 00:00:00 2001
From: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Date: Fri, 10 Nov 2023 14:49:48 +0900
Subject: [PATCH] EntityStorage deletion fix? (#548)

---
 .../Storage/EntitySystems/SharedEntityStorageSystem.cs         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
index 911c6e5380..0c01be5369 100644
--- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -213,6 +213,9 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
     public void CloseStorage(EntityUid uid, SharedEntityStorageComponent? component = null)
     {
+        if (EntityManager.IsQueuedForDeletion(uid)) // WD
+            return;
+            
         if (!ResolveStorage(uid, ref component))
             return;