From c5a98129ff0b9e66582152412a9831b48a4fcbef Mon Sep 17 00:00:00 2001
From: Alex Evgrashin <aevgrashin@yandex.ru>
Date: Tue, 4 Jan 2022 00:32:16 +0300
Subject: [PATCH] Sync station rotation with a spawned salvage rotation (#5998)

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: Alexander Evgrashin <evgrashin.adl@gmail.com>
---
 Content.Server/Salvage/SalvageSystem.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Salvage/SalvageSystem.cs b/Content.Server/Salvage/SalvageSystem.cs
index 5c0e3c0096..5c94582c6b 100644
--- a/Content.Server/Salvage/SalvageSystem.cs
+++ b/Content.Server/Salvage/SalvageSystem.cs
@@ -215,10 +215,9 @@ namespace Content.Server.Salvage
             {
                 coords = new EntityCoordinates(smc.Owner, smc.Offset).ToMap(EntityManager);
                 var grid = tsc.GridID;
-                if (grid != GridId.Invalid)
+                if (_mapManager.TryGetGrid(grid, out var magnetGrid))
                 {
-                    // Has a valid grid - synchronize angle so that salvage doesn't have to deal with cross-grid manipulation issues
-                    angle = tsc.WorldRotation;
+                    angle = magnetGrid.WorldRotation;
                 }
                 return true;
             }