From 08ee5c3f71cb2ef2cec125c8acef2ad5d23ad6f1 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 19 Apr 2026 08:16:50 -0400 Subject: [PATCH] Abstract New_Player Hard Del Fix (#22270) Fixes a HardDel() related to players joining too quickly when entering the server, and also just when latejoining in general (wtf) --- code/modules/mob/abstract/new_player/login.dm | 2 +- code/modules/mob/abstract/new_player/new_player.dm | 2 +- html/changelogs/hellfirejag-new-player-hard-del.yml | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/hellfirejag-new-player-hard-del.yml diff --git a/code/modules/mob/abstract/new_player/login.dm b/code/modules/mob/abstract/new_player/login.dm index 4ff657a815d..c1b312155ab 100644 --- a/code/modules/mob/abstract/new_player/login.dm +++ b/code/modules/mob/abstract/new_player/login.dm @@ -12,7 +12,7 @@ GLOB.player_list |= src client.playtitlemusic() - addtimer(CALLBACK(src, PROC_REF(show_lobby_info)), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(show_lobby_info)), 5 SECONDS, TIMER_STOPPABLE | TIMER_DELETE_ME) /mob/abstract/new_player/proc/show_lobby_info() if(!client) diff --git a/code/modules/mob/abstract/new_player/new_player.dm b/code/modules/mob/abstract/new_player/new_player.dm index 26b32ec4802..b66667ea8c6 100644 --- a/code/modules/mob/abstract/new_player/new_player.dm +++ b/code/modules/mob/abstract/new_player/new_player.dm @@ -35,7 +35,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) stack_trace("The map is supposedly loaded, but GLOB.lobby_mobs_location is not set, unable to move the lobby mob!") return - addtimer(CALLBACK(src, PROC_REF(attempt_moving_new_player_on_marker_turf)), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(attempt_moving_new_player_on_marker_turf)), 5 SECONDS, TIMER_STOPPABLE | TIMER_DELETE_ME) /mob/abstract/new_player/Destroy() QDEL_NULL(late_choices_ui) diff --git a/html/changelogs/hellfirejag-new-player-hard-del.yml b/html/changelogs/hellfirejag-new-player-hard-del.yml new file mode 100644 index 00000000000..d7d0ddc75c5 --- /dev/null +++ b/html/changelogs/hellfirejag-new-player-hard-del.yml @@ -0,0 +1,4 @@ +author: Hellfirejag +delete-after: True +changes: + - bugfix: "Fixed a hard del caused by players joining a round too quickly after first connecting, or by latejoining."