From 05840f6d2b9333d512ffc7d454ca726070894b2f Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Thu, 11 Sep 2025 21:15:18 +0200
Subject: [PATCH] fix bad persistent client handling (#18460)

---
 code/modules/mob/new_player/lobby_browser.dm | 2 +-
 code/modules/mob/new_player/login.dm         | 1 +
 code/modules/mob/new_player/logout.dm        | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/new_player/lobby_browser.dm b/code/modules/mob/new_player/lobby_browser.dm
index e795aafa318..8a3996f4e23 100644
--- a/code/modules/mob/new_player/lobby_browser.dm
+++ b/code/modules/mob/new_player/lobby_browser.dm
@@ -146,7 +146,7 @@
 			handle_server_news()
 			return TRUE
 		if("give_feedback")
-			if(!SSsqlite.can_submit_feedback(GLOB.persistent_clients_by_ckey[ckey]))
+			if(!SSsqlite.can_submit_feedback(persistent_client.client))
 				return
 
 			if(client.feedback_form)
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index 1036feb1246..f3fc3e0a3d6 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -18,6 +18,7 @@
 	GLOB.new_player_list += src
 
 	created_for = ckey
+	client.persistent_client.set_mob(src)
 
 	addtimer(CALLBACK(src, PROC_REF(do_after_login)), 4 SECONDS, TIMER_DELETE_ME)
 	initialize_lobby_screen()
diff --git a/code/modules/mob/new_player/logout.dm b/code/modules/mob/new_player/logout.dm
index b8e379178f5..0b1c17ced8f 100644
--- a/code/modules/mob/new_player/logout.dm
+++ b/code/modules/mob/new_player/logout.dm
@@ -17,6 +17,6 @@
 	return
 
 /mob/new_player/proc/disable_lobby_browser()
-	var/client/exiting_client = GLOB.persistent_clients_by_ckey[ckey]
+	var/client/exiting_client = persistent_client.client
 	if(exiting_client)
 		winset(exiting_client, "lobby_browser", "is-disabled=true;is-visible=false")