From 0a48d8038f58bf595e0ad26be4ac8ebb8c32f5a3 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Tue, 21 Jun 2022 13:59:35 +1200
Subject: [PATCH] Fix salvage player deletion (#8977)

---
 Content.Server/Salvage/SalvageSystem.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Salvage/SalvageSystem.cs b/Content.Server/Salvage/SalvageSystem.cs
index 793adecba3..212c6547f6 100644
--- a/Content.Server/Salvage/SalvageSystem.cs
+++ b/Content.Server/Salvage/SalvageSystem.cs
@@ -25,7 +25,6 @@ namespace Content.Server.Salvage
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-        [Dependency] private readonly StationSystem _stationSystem = default!;
         [Dependency] private readonly ChatSystem _chatSystem = default!;
 
         private static readonly TimeSpan AttachingTime = TimeSpan.FromSeconds(30);
@@ -204,7 +203,9 @@ namespace Content.Server.Salvage
                     Transform(playerEntityUid).AttachParent(parentTransform);
                 }
             }
-            EntityManager.QueueDeleteEntity(salvage);
+
+            // Deletion has to happen before grid traversal re-parents players.
+            EntityManager.DeleteEntity(salvage);
         }
 
         private void TryGetSalvagePlacementLocation(SalvageMagnetComponent component, out MapCoordinates coords, out Angle angle)