Merge pull request #1005 from diath/message_prefixes

Don't apply message prefixes to messages with empty name
This commit is contained in:
Samuel Gros 2019-01-06 14:32:59 +01:00 committed by GitHub
commit a6c7269f78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions

View File

@ -684,7 +684,7 @@ function addTabText(text, speaktype, tab, creatureName)
child:setSelection(string.len(child:getText()), textPos) child:setSelection(string.len(child:getText()), textPos)
end end
end end
return true return true
end end
@ -857,14 +857,14 @@ function sendMessage(message, tab)
message = chatCommandMessage message = chatCommandMessage
channel = 0 channel = 0
end end
-- player red talk on channel -- player red talk on channel
chatCommandMessage = message:match("^%#[c|C] (.*)") chatCommandMessage = message:match("^%#[c|C] (.*)")
if chatCommandMessage ~= nil then if chatCommandMessage ~= nil then
chatCommandSayMode = 'channelRed' chatCommandSayMode = 'channelRed'
message = chatCommandMessage message = chatCommandMessage
end end
-- player broadcast -- player broadcast
chatCommandMessage = message:match("^%#[b|B] (.*)") chatCommandMessage = message:match("^%#[b|B] (.*)")
if chatCommandMessage ~= nil then if chatCommandMessage ~= nil then
@ -978,7 +978,7 @@ function navigateMessageHistory(step)
end end
function applyMessagePrefixies(name, level, message) function applyMessagePrefixies(name, level, message)
if name then if name and #name > 0 then
if modules.client_options.getOption('showLevelsInConsole') and level > 0 then if modules.client_options.getOption('showLevelsInConsole') and level > 0 then
message = name .. ' [' .. level .. ']: ' .. message message = name .. ' [' .. level .. ']: ' .. message
else else