starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-04 16:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: standardize notifications and get rid of chat messages

Browse Source
This commit is contained in:
0xDEMXN
2022-02-18 12:00:01 +01:00
parent 084dc23e50
commit 1edf290943
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx]/es_extended/client/main.lua
+1 -1
View File
@@ -257,7 +257,7 @@ AddEventHandler('esx:spawnVehicle', function(vehicle)
TaskWarpPedIntoVehicle(ESX.PlayerData.ped, vehicle, -1) TaskWarpPedIntoVehicle(ESX.PlayerData.ped, vehicle, -1)
end) end)
else else
TriggerEvent('chat:addMessage', { args = { '^1SYSTEM', 'Invalid vehicle model.' } }) ESX.ShowNotification('Invalid vehicle model.')
end end
end end
end) end)
[esx]/es_extended/server/functions.lua
+2 -2
View File
@@ -124,14 +124,14 @@ function ESX.RegisterCommand(name, group, cb, allowConsole, suggestion)
if playerId == 0 then if playerId == 0 then
print(('[^3WARNING^7] %s^7'):format(error)) print(('[^3WARNING^7] %s^7'):format(error))
else else
xPlayer.triggerEvent('chat:addMessage', {args = {'^1SYSTEM', error}}) xPlayer.showNotification(error)
end end
else else
cb(xPlayer or false, args, function(msg) cb(xPlayer or false, args, function(msg)
if playerId == 0 then if playerId == 0 then
print(('[^3WARNING^7] %s^7'):format(msg)) print(('[^3WARNING^7] %s^7'):format(msg))
else else
xPlayer.triggerEvent('chat:addMessage', {args = {'^1SYSTEM', msg}}) xPlayer.showNotification(msg)
end end
end) end)
end end
[esx]/es_extended/server/main.lua
+2 -1
View File
@@ -301,10 +301,11 @@ function loadESXPlayer(identifier, playerId, isNew)
end end
AddEventHandler('chatMessage', function(playerId, author, message) AddEventHandler('chatMessage', function(playerId, author, message)
local xPlayer = ESX.GetPlayerFromId(playerId)
if message:sub(1, 1) == '/' and playerId > 0 then if message:sub(1, 1) == '/' and playerId > 0 then
CancelEvent() CancelEvent()
local commandName = message:sub(1):gmatch("%w+")() local commandName = message:sub(1):gmatch("%w+")()
TriggerClientEvent('chat:addMessage', playerId, {args = {'^1SYSTEM', _U('commanderror_invalidcommand', commandName)}}) xPlayer.showNotification(_U('commanderror_invalidcommand', commandName))
end end
end) end)
[esx_addons]/esx_basicneeds/server/main.lua
+1 -1
View File
@@ -18,7 +18,7 @@ end)
ESX.RegisterCommand('heal', 'admin', function(xPlayer, args, showError) ESX.RegisterCommand('heal', 'admin', function(xPlayer, args, showError)
args.playerId.triggerEvent('esx_basicneeds:healPlayer') args.playerId.triggerEvent('esx_basicneeds:healPlayer')
args.playerId.triggerEvent('chat:addMessage', {args = {'^5HEAL', 'You have been healed.'}}) args.playerId.showNotification('You have been healed.')
end, true, {help = 'Heal a player, or yourself - restores thirst, hunger and health.', validate = true, arguments = { end, true, {help = 'Heal a player, or yourself - restores thirst, hunger and health.', validate = true, arguments = {
{name = 'playerId', help = 'the player id', type = 'player'} {name = 'playerId', help = 'the player id', type = 'player'}
}}) }})