Improve test stability (#10913)

2022-08-28 15:13:59 -07:00
parent 9d2a76e2d4
commit ea95638189
7 changed files with 78 additions and 60 deletions
--- a/Content.Shared/Body/Components/SharedBodyComponent.cs
+++ b/Content.Shared/Body/Components/SharedBodyComponent.cs
@@ -395,7 +395,8 @@ namespace Content.Shared.Body.Components
            var gibs = new HashSet<EntityUid>();
            foreach (var part in SlotParts.Keys)
            {
-                if (!metaQuery.HasComponent(part.Owner))
+                if (!metaQuery.TryGetComponent(part.Owner, out var meta) ||
+                    meta.EntityLifeStage >= EntityLifeStage.Terminating)
                {
                    SlotParts.Remove(part);
                    continue;