Tweak

MrMelbert · Jan 30, 2025 · bc6f2b7 · bc6f2b7
1 parent 773a18d
commit bc6f2b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
@@ -434,7 +434,7 @@
 		to_chat(src, span_danger("You have been banned from lobby chat."))
 		return
 
-	message = copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN)
+	message = trim(sanitize(message), MAX_MESSAGE_LEN)
 	var/list/filter_result = is_ooc_filtered(message)
 	if (!CAN_BYPASS_FILTER(mob) && filter_result)
 		REPORT_CHAT_FILTER_TO_USER(src, filter_result)
@@ -446,7 +446,7 @@
 			return
 		message_admins("[ADMIN_LOOKUPFLW(src)] has passed the soft filter for \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\" they may be using a disallowed term. Message: \"[message]\"")
 		log_admin_private("[key_name(src)] has passed the soft filter for \"[soft_filter_result[CHAT_FILTER_INDEX_WORD]]\" they may be using a disallowed term. Message: \"[message]\"")
-	if(!message)
+	if(!message || QDELETED(src))
 		return
 	mob.log_talk(message, LOG_OOC)
 	message = "<span class='message linkify'>[emoji_parse(message)]</span>"

diff --git a/maplestation_modules/code/modules/client/verbs/looc.dm b/maplestation_modules/code/modules/client/verbs/looc.dm
@@ -55,8 +55,7 @@ GLOBAL_VAR_INIT(looc_allowed, TRUE)
 	if(QDELETED(src))
 		return
 
-	msg = copytext_char(sanitize(msg), 1, MAX_MESSAGE_LEN)
-
+	msg = trim(sanitize(msg), MAX_MESSAGE_LEN)
 	if(!msg)
 		return