From 9001b56bae8b34893b50f60395297aced0cd2b38 Mon Sep 17 00:00:00 2001
From: Ninjapikachushka <ninja_pikachu@rambler.ru>
Date: Fri, 9 Aug 2024 14:57:06 +0300
Subject: [PATCH 1/3] some guard fixes

---
 code/modules/admin/admin.dm        | 13 ++++++++++---
 code/modules/admin/topic.dm        | 20 ++++++++++++++++----
 code/modules/client/preferences.dm |  1 +
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index b511f384c381..77a24c3d71de 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -71,9 +71,16 @@ var/global/BSACooldown = 0
 		<a href='?src=\ref[src];adminplayerobservefollow=\ref[M]'>FLW</a>
 		<br>
 		<b>Mob type</b> = [M.type]<br><br>
-		<b>Guard:</b> <A href='?src=\ref[src];guard=\ref[M]'>Show</A><br>
-		<b>Related accounts by current IP and CID</b>: <A href='?src=\ref[src];related_accounts=\ref[M]'>Get</A><br>
-		<b>Slow queries:</b> <A href='?src=\ref[src];cid_history=\ref[M]'>CID history</A> | <A href='?src=\ref[src];ip_history=\ref[M]'>IP history</A><br>
+		"}
+
+	if(M.client)
+		body += {"
+			<b>Guard:</b> <A href='?src=\ref[src];guard=\ref[M]'>Show</A><br>
+			<b>Related accounts by current IP and CID</b>: <A href='?src=\ref[src];related_accounts=\ref[M]'>Get</A><br>
+			<b>Slow queries:</b> <A href='?src=\ref[src];cid_history=\ref[M]'>CID history</A> | <A href='?src=\ref[src];ip_history=\ref[M]'>IP history</A><br>
+		"}
+
+	body += {"
 		<b>CentCom (other server bans)</b>: <A target='_blank' href='https://centcom.melonmesa.com/viewer/view/[M.ckey]'>CentCom (ENG)</A><br>
 		<b>BYOND profile</b>: <A target='_blank' href='http://byond.com/members/[M.ckey]'>[M.ckey]</A><br><br>
 		<A href='?src=\ref[src];boot2=\ref[M]'>Kick</A> |
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index bf4b224fdedc..0f7849b6fd73 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -900,6 +900,7 @@
 		var/mob/M = locate(href_list["guard"])
 		if (ismob(M))
 			if(!M.client)
+				show_player_panel(M)
 				return
 			M.client.prefs.guard.print_report()
 
@@ -908,7 +909,11 @@
 			return
 
 		var/mob/M = locate(href_list["cid_history"])
-		if (!ismob(M) || !M.client)
+		if (!ismob(M))
+			return
+
+		if(!M.client)
+			show_player_panel(M)
 			return
 
 		var/client/C = M.client
@@ -939,7 +944,11 @@
 			return
 
 		var/mob/M = locate(href_list["ip_history"])
-		if (!ismob(M) || !M.client)
+		if (!ismob(M))
+			return
+
+		if(!M.client)
+			show_player_panel(M)
 			return
 
 		var/client/C = M.client
@@ -972,6 +981,7 @@
 			var/mob/M = locate(href_list["related_accounts"])
 			if (ismob(M))
 				if(!M.client)
+					show_player_panel(M)
 					return
 				var/client/C = M.client
 
@@ -1068,6 +1078,7 @@
 		if(!ismob(M))
 			return
 		if(!M.client)
+			show_player_panel(M)
 			return
 
 		var/ban_mute_type = input("Choose chat for ban:", "Chat ban") as null|anything in global.mute_ban_bitfield
@@ -1116,6 +1127,7 @@
 		if(!ismob(M))
 			return
 		if(!M.client)
+			show_player_panel(M)
 			return
 
 		var/type = href_list["type"]
@@ -2354,7 +2366,7 @@
 		var/id = text2num(href_list["index"])
 
 		var/DBQuery/query = dbcon.NewQuery({"SELECT type, adminckey, text
-			FROM erro_messages 
+			FROM erro_messages
 			WHERE id='[id]' AND deleted=0"})
 		query.Execute()
 
@@ -2387,7 +2399,7 @@
 		var/id = text2num(href_list["index"])
 
 		var/DBQuery/query = dbcon.NewQuery({"SELECT type, adminckey, text
-			FROM erro_messages 
+			FROM erro_messages
 			WHERE id='[id]' AND deleted=0"})
 		query.Execute()
 
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index c2115f4403fa..da3ada93aecb 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -212,6 +212,7 @@ var/global/list/datum/preferences/preferences_datums = list()
 // reattach existing datum to client if client was disconnected and connects again
 /datum/preferences/proc/reattach_to_client(client/client)
 	parent = client
+	guard.holder = client
 
 /datum/preferences/proc/init_chat_bans()
 	if(!config.sql_enabled)

From 34e067127e8b5de7e6fcfc51f6becf619143e28c Mon Sep 17 00:00:00 2001
From: NinjaPikachuska <89906909+NinjaPikachuska@users.noreply.github.com>
Date: Fri, 9 Aug 2024 15:13:38 +0300
Subject: [PATCH 2/3] Update code/modules/admin/topic.dm

---
 code/modules/admin/topic.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 0f7849b6fd73..95a96f28905e 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2366,7 +2366,7 @@
 		var/id = text2num(href_list["index"])
 
 		var/DBQuery/query = dbcon.NewQuery({"SELECT type, adminckey, text
-			FROM erro_messages
+			FROM erro_messages 
 			WHERE id='[id]' AND deleted=0"})
 		query.Execute()
 

From aad778647a80bfe102a7df0e5c64fce85b1f10cf Mon Sep 17 00:00:00 2001
From: NinjaPikachuska <89906909+NinjaPikachuska@users.noreply.github.com>
Date: Fri, 9 Aug 2024 15:13:43 +0300
Subject: [PATCH 3/3] Update code/modules/admin/topic.dm

---
 code/modules/admin/topic.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 95a96f28905e..fdd660f80abd 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2399,7 +2399,7 @@
 		var/id = text2num(href_list["index"])
 
 		var/DBQuery/query = dbcon.NewQuery({"SELECT type, adminckey, text
-			FROM erro_messages
+			FROM erro_messages 
 			WHERE id='[id]' AND deleted=0"})
 		query.Execute()