From 5252952555d204e4b5c1a2a4367b36665c476451 Mon Sep 17 00:00:00 2001 From: cora Date: Mon, 29 Nov 2021 12:52:06 +0100 Subject: [PATCH] strip newlines from tools in death messages Players naming their tools with newlines can mess up chat with death messages. This commit strips out newlines (\r and \n ) in the tool name for death messages. --- mods/HUD/mcl_death_messages/init.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/HUD/mcl_death_messages/init.lua b/mods/HUD/mcl_death_messages/init.lua index ff6ef005..aed8c770 100644 --- a/mods/HUD/mcl_death_messages/init.lua +++ b/mods/HUD/mcl_death_messages/init.lua @@ -3,11 +3,11 @@ local N = function(s) return s end local function get_tool_name(item) local name = item:get_meta():get_string("name") - if name ~= "" then - return name + if name == "" then + local def = item:get_definition() + name=def._tt_original_description or def.description end - local def = item:get_definition() - return def._tt_original_description or def.description + return name:gsub("[\r\n]"," ") end mcl_death_messages = {}