chat updates for feature/command-updates

This commit is contained in:
moscovium
2017-07-09 16:21:45 +02:00
parent ee0fe0deb8
commit 602753f59e
2 changed files with 37 additions and 2 deletions

View File

@@ -5,6 +5,7 @@ RegisterServerEvent('chat:addSuggestion')
RegisterServerEvent('chat:removeSuggestion')
RegisterServerEvent('_chat:messageEntered')
RegisterServerEvent('chat:clear')
RegisterServerEvent('__cfx_internal:commandFallback')
AddEventHandler('_chat:messageEntered', function(author, color, message)
if not message or not author then
@@ -14,13 +15,24 @@ AddEventHandler('_chat:messageEntered', function(author, color, message)
TriggerEvent('chatMessage', source, author, message)
if not WasEventCanceled() then
print("No cancel")
TriggerClientEvent('chatMessage', -1, author, { 255, 255, 255 }, message)
end
print(author .. ': ' .. message)
end)
AddEventHandler('__cfx_internal:commandFallback', function(command)
local name = GetPlayerName(source)
TriggerEvent('chatMessage', source, name, '/' .. command)
if not WasEventCanceled() then
TriggerClientEvent('chatMessage', -1, name, { 255, 255, 255 }, '/' .. command)
end
CancelEvent()
end)
-- player join messages
AddEventHandler('playerActivated', function()
TriggerClientEvent('chatMessage', -1, '', { 255, 255, 255 }, '^2* ' .. GetPlayerName(source) .. ' joined.')
@@ -29,3 +41,7 @@ end)
AddEventHandler('playerDropped', function(reason)
TriggerClientEvent('chatMessage', -1, '', { 255, 255, 255 }, '^2* ' .. GetPlayerName(source) ..' left (' .. reason .. ')')
end)
RegisterCommand('say', function(source, args, rawCommand)
TriggerClientEvent('chatMessage', -1, (source == 0) and 'console' or GetPlayerName(source), { 255, 255, 255 }, rawCommand:sub(5))
end)