From ec75a270eb1fe5eb1ed634d7bfd91fb2d0e84ecc Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sun, 8 Nov 2020 20:30:01 +0100
Subject: [PATCH] [MIRROR] PR about an old ghastly ref issue. (#1630)

* Fixing an old ghastly reference issue. (#54820)

* PR about an old ghastly ref issue.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
---
 code/modules/mob/logout.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index fad8467207f..0d0623a19b0 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -4,7 +4,10 @@
 	SStgui.on_logout(src)
 	unset_machine()
 	remove_from_player_list()
-
+	if(client?.movingmob) //In the case the client was transferred to another mob and not deleted.
+		client.movingmob.client_mobs_in_contents -= src
+		UNSETEMPTY(client.movingmob.client_mobs_in_contents)
+		client.movingmob = null
 	..()
 
 	if(loc)