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

Try fix messages not sending + add phone animation

Browse Source
This commit is contained in:
Jérémie N'gadi
2017-09-13 14:52:49 +02:00
parent 68477e141f
commit 8faec4d095
2 changed files with 32 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+12 -2
View File
@@ -38,6 +38,8 @@ end)
function OpenPhone()
local playerPed = GetPlayerPed(-1)
TriggerServerEvent('esx_phone:reload', PhoneData.phoneNumber)
SendNUIMessage({
@@ -51,10 +53,16 @@ function OpenPhone()
SetNuiFocus(true, true)
end)
if not IsPedInAnyVehicle(playerPed, false) then
TaskStartScenarioInPlace(playerPed, "WORLD_HUMAN_STAND_MOBILE", 0, true);
end
end
function ClosePhone()
local playerPed = GetPlayerPed(-1)
SendNUIMessage({
showPhone = false
})
@@ -63,6 +71,8 @@ function ClosePhone()
GUI.PhoneIsShowed = false
ClearPedTasks(playerPed)
end
RegisterNetEvent('esx_phone:loaded')
@@ -136,9 +146,9 @@ RegisterNetEvent('esx_phone:onMessage')
AddEventHandler('esx_phone:onMessage', function(phoneNumber, message, position, anon, job, dispatchRequestId)
if job == 'player' then
ESX.ShowNotification(_U('new_message', message))
ESX.ShowNotification(_U('new_message', message))
else
ESX.ShowNotification('~b~' .. job .. ': ~s~' .. message)
ESX.ShowNotification('~b~' .. job .. ': ~s~' .. message)
end
SendNUIMessage({
server/main.lua
+20 -43
View File
@@ -61,10 +61,10 @@ AddEventHandler('esx:playerLoaded', function(source)
local xPlayer = ESX.GetPlayerFromId(source)
for k,v in pairs(PhoneNumbers) do
for num,v in pairs(PhoneNumbers) do
if tonumber(k) == k then -- If phonenumber is a player phone number
for i=1, #v.sources, 1 do
TriggerClientEvent('esx_phone:setPhoneNumberSource', source, k, v.sources[i])
for src,_ in pairs(v.sources) do
TriggerClientEvent('esx_phone:setPhoneNumberSource', source, num, tonumber(src))
end
end
end
@@ -99,7 +99,7 @@ AddEventHandler('esx:playerLoaded', function(source)
sharePos = false,
hideNumber = false,
hidePosIfAnon = false,
sources = {source}
sources = {[source] = true}
}
xPlayer.set('phoneNumber', phoneNumber)
@@ -184,27 +184,23 @@ AddEventHandler('esx_phone:send', function(phoneNumber, message, anon, position)
if PhoneNumbers[phoneNumber] ~= nil then
for i=1, #PhoneNumbers[phoneNumber].sources, 1 do
for k,v in pairs(PhoneNumbers[phoneNumber].sources) do
if PhoneNumbers[phoneNumber].sources[i] ~= nil then
local numType = PhoneNumbers[phoneNumber].type
local numHasDispatch = PhoneNumbers[phoneNumber].hasDispatch
local numHide = PhoneNumbers[phoneNumber].hideNumber
local numHidePosIfAnon = PhoneNumbers[phoneNumber].hidePosIfAnon
local numPosition = (PhoneNumbers[phoneNumber].sharePos and position or false)
local numSource = tonumber(k)
local numType = PhoneNumbers[phoneNumber].type
local numHasDispatch = PhoneNumbers[phoneNumber].hasDispatch
local numHide = PhoneNumbers[phoneNumber].hideNumber
local numHidePosIfAnon = PhoneNumbers[phoneNumber].hidePosIfAnon
local numPosition = (PhoneNumbers[phoneNumber].sharePos and position or false)
local numSource = PhoneNumbers[phoneNumber].sources[i]
if numHidePosIfAnon and anon then
numPosition = false
end
if numHasDispatch then
TriggerClientEvent('esx_phone:onMessage', numSource, xPlayer.get('phoneNumber'), message, numPosition, (numHide and true or anon), numType, GetDistpatchRequestId())
else
TriggerClientEvent('esx_phone:onMessage', numSource, xPlayer.get('phoneNumber'), message, numPosition, (numHide and true or anon), numType, false)
end
if numHidePosIfAnon and anon then
numPosition = false
end
if numHasDispatch then
TriggerClientEvent('esx_phone:onMessage', numSource, xPlayer.get('phoneNumber'), message, numPosition, (numHide and true or anon), numType, GetDistpatchRequestId())
else
TriggerClientEvent('esx_phone:onMessage', numSource, xPlayer.get('phoneNumber'), message, numPosition, (numHide and true or anon), numType, false)
end
end
@@ -230,30 +226,11 @@ AddEventHandler('esx_phone:registerNumber', function(number, type, sharePos, has
end)
AddEventHandler('esx_phone:addSource', function(number, source)
local found = false
for i=1, #PhoneNumbers[number].sources, 1 do
if PhoneNumbers[number].sources[i] == source then
found = true
break
end
end
if not found then
table.insert(PhoneNumbers[number].sources, source)
end
PhoneNumbers[number].sources[tostring(source)] = true
end)
AddEventHandler('esx_phone:removeSource', function(number, source)
for i=1, #PhoneNumbers[number].sources, 1 do
if PhoneNumbers[number].sources[i] == source then
PhoneNumbers[number].sources[i] = nil
end
end
PhoneNumbers[number].sources[tostring(source)] = nil
end)
RegisterServerEvent('esx_phone:addPlayerContact')