From 58cacd12ed1011fd86ba60c4a38ab8a7ec4f0294 Mon Sep 17 00:00:00 2001
From: themias <89101928+themias@users.noreply.github.com>
Date: Wed, 1 Jun 2022 03:39:50 -0400
Subject: [PATCH] Fix bug where being eaten as a mouse tethers your ghost to
 who ate you (#8338)

* Check if the ghost spawn position is in inventory/default/null-space

* attach to grid instead of default spawn point

* Simply attach to grid first before entity is deleted
---
 Content.Server/Mind/MindSystem.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs
index b6121da439..daf2c4a9c5 100644
--- a/Content.Server/Mind/MindSystem.cs
+++ b/Content.Server/Mind/MindSystem.cs
@@ -80,6 +80,7 @@ public sealed class MindSystem : EntitySystem
             }
             else if (mind.GhostOnShutdown)
             {
+                Transform(uid).AttachToGridOrMap();
                 var spawnPosition = Transform(uid).Coordinates;
                 // Use a regular timer here because the entity has probably been deleted.
                 Timer.Spawn(0, () =>