From f9589f82cc4d5babbfaf9f64e6530ce4e01443c9 Mon Sep 17 00:00:00 2001
From: wrexbe <81056464+wrexbe@users.noreply.github.com>
Date: Tue, 5 Jul 2022 09:24:29 -0700
Subject: [PATCH] Fix salvage gib attempt 2 (#9444)

---
 Content.Shared/Body/Components/SharedBodyComponent.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Content.Shared/Body/Components/SharedBodyComponent.cs b/Content.Shared/Body/Components/SharedBodyComponent.cs
index 76cf0ca4c2..ca1c2ed81f 100644
--- a/Content.Shared/Body/Components/SharedBodyComponent.cs
+++ b/Content.Shared/Body/Components/SharedBodyComponent.cs
@@ -390,9 +390,16 @@ namespace Content.Shared.Body.Components
 
         public virtual HashSet<EntityUid> Gib(bool gibParts = false)
         {
+            var entMgr = IoCManager.Resolve<IEntityManager>();
+            var metaQuery = entMgr.GetEntityQuery<MetaDataComponent>();
             var gibs = new HashSet<EntityUid>();
             foreach (var part in SlotParts.Keys)
             {
+                if (!metaQuery.HasComponent(part.Owner))
+                {
+                    SlotParts.Remove(part);
+                    continue;
+                }
                 gibs.Add(part.Owner);
                 RemovePart(part);