From d253a3b767962aec6f12fc50f2bab0041bba0443 Mon Sep 17 00:00:00 2001 From: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Date: Sun, 30 Jan 2022 01:22:18 -0800 Subject: [PATCH] Ensures that COMSIG_PARENT_QDELETING is sent before client Destroy. (#64536) I want to let logic rely on this, so I'ma just ensure it can --- code/modules/client/client_procs.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 5611b817f0b..4477b0fec77 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -491,6 +491,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( /client/Del() if(!gc_destroyed) + // Yes this is the same as what's found in qdel(). Yes it does need to be here + // Get off my back + SEND_SIGNAL(src, COMSIG_PARENT_QDELETING, TRUE) Destroy() //Clean up signals and timers. return ..() @@ -501,7 +504,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if (!stealth_admin) deadchat_broadcast(" has disconnected.", "[mob][mob.get_realname_string()]", follow_target = mob, turf_target = get_turf(mob), message_type = DEADCHAT_LOGIN_LOGOUT, admin_only=!announce_join) mob.become_uncliented() - + GLOB.clients -= src GLOB.directory -= ckey log_access("Logout: [key_name(src)]")