starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-31 02:08:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for the new es_extended + feature

Browse Source 
Fix for the proximity BUG with the new ESX, and added feature for anonymous tweets, using the command /anontwt
This commit is contained in:
Jimmy Bassy
2020-06-28 23:12:24 +02:00
parent 83914926b2
commit d99cfff4f2
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+6 -2
View File
@@ -3,8 +3,10 @@ AddEventHandler('esx_rpchat:sendProximityMessage', function(playerId, title, mes
local player = PlayerId()
local target = GetPlayerFromServerId(playerId)
local playerPed, targetPed = PlayerPedId(), GetPlayerPed(target)
local playerCoords, targetCoords = GetEntityCoords(playerPed), GetEntityCoords(targetPed)
local playerPed = PlayerPedId()
local targetPed = GetPlayerPed(target)
local playerCoords = GetEntityCoords(playerPed)
local targetCoords = GetEntityCoords(targetPed)
if target == player or #(playerCoords - targetCoords) < 20 then
TriggerEvent('chat:addMessage', {args = {title, message}, color = color})
@@ -13,6 +15,7 @@ end)
Citizen.CreateThread(function()
TriggerEvent('chat:addSuggestion', '/twt', _U('twt_help'), {{name = _U('generic_argument_name'), help = _U('generic_argument_help')}})
TriggerEvent('chat:addSuggestion', '/anontwt', _U('twtanon_help'), {{name = _U('generic_argument_name'), help = _U('generic_argument_help')}})
TriggerEvent('chat:addSuggestion', '/me', _U('me_help'), {{name = _U('generic_argument_name'), help = _U('generic_argument_help')}})
TriggerEvent('chat:addSuggestion', '/do', _U('do_help'), {{name = _U('generic_argument_name'), help = _U('generic_argument_help')}})
end)
@@ -24,3 +27,4 @@ AddEventHandler('onResourceStop', function(resource)
TriggerEvent('chat:removeSuggestion', '/do')
end
end)
server/main.lua
+15 -2
View File
@@ -16,12 +16,25 @@ RegisterCommand('twt', function(playerId, args, rawCommand)
print('esx_rpchat: you can\'t use this command from console!')
else
args = table.concat(args, ' ')
local playerName = GetRealPlayerName(playerId)
TriggerClientEvent('chat:addMessage', -1, {args = {_U('twt_prefix', playerName), args}, color = {0, 153, 204}})
end
end, false)
RegisterCommand('anontwt', function(playerId, args, rawCommand)
if playerId == 0 then
print('esx_rpchat: you can\'t use this command from console!')
else
args = table.concat(args, ' ')
local playerName = GetRealPlayerName(playerId)
TriggerClientEvent('chat:addMessage', -1, {args = {_U('twt_prefix', "Anonymous"), args}, color = {0, 153, 204}})
end
end, false)
RegisterCommand('me', function(playerId, args, rawCommand)
if playerId == 0 then
print('esx_rpchat: you can\'t use this command from console!')
@@ -29,7 +42,7 @@ RegisterCommand('me', function(playerId, args, rawCommand)
args = table.concat(args, ' ')
local playerName = GetRealPlayerName(playerId)
TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('me_prefix', playerName), args, {255, 0, 0})
TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, playerId, _U('me_prefix', playerName), args, {255, 0, 0})
end
end, false)
@@ -40,7 +53,7 @@ RegisterCommand('do', function(playerId, args, rawCommand)
args = table.concat(args, ' ')
local playerName = GetRealPlayerName(playerId)
TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, source, _U('do_prefix', playerName), args, {0, 0, 255})
TriggerClientEvent('esx_rpchat:sendProximityMessage', -1, playerId, _U('do_prefix', playerName), args, {0, 0, 255})
end
end, false)