diff --git a/client.lua b/client.lua index 8f9e976..344cd63 100644 --- a/client.lua +++ b/client.lua @@ -1,21 +1,3 @@ -ESX = nil - -TriggerEvent(Config.ESXTrigger, function(obj) ESX = obj end) - - -RegisterNetEvent('esx:playerLoaded') -AddEventHandler('esx:playerLoaded', function(xPlayer) - ESX.PlayerData = xPlayer -end) -RegisterNetEvent('esx:setJob') -AddEventHandler('esx:setJob', function(job) - ESX.PlayerData.job = job -end) -RegisterNetEvent('esx:setJob2') -AddEventHandler('esx:setJob2', function(job2) - ESX.PlayerData.job2 = job2 -end) - RegisterNetEvent('Ise_Logs2') AddEventHandler('Ise_Logs2', function(Color, Title, Description) TriggerServerEvent('Ise_Logs2', Color, Title, Description) @@ -1850,4 +1832,4 @@ Citizen.CreateThread(function() end) end end -end) \ No newline at end of file +end) diff --git a/config.lua b/config.lua index 706bc86..937b403 100644 --- a/config.lua +++ b/config.lua @@ -1,8 +1,6 @@ Config = {} Config = { - ------------ - ESXTrigger = "esx:getSharedObject", ------------ ColorMenuR = 255, -- Bannière couleur R ColorMenuG = 11, -- Bannière couleur G diff --git a/fxmanifest.lua b/fxmanifest.lua index 2d77697..c86986e 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -10,7 +10,10 @@ server_scripts { "config.lua", } -shared_script "config.lua" +shared_script { +"config.lua", +"@es_extended/imports.lua", +} client_scripts { "src/RMenu.lua", diff --git a/report.lua b/report.lua index 68d90e4..5bc20fe 100644 --- a/report.lua +++ b/report.lua @@ -1,13 +1,4 @@ if Config.Report == true then -ESX = nil - -Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(100) - end -end) - RegisterNetEvent("finalmenuadmin:sendNotifForReport") AddEventHandler("finalmenuadmin:sendNotifForReport", function(type, nomdumec, raisondumec) diff --git a/server.lua b/server.lua index eba9bd7..e1188db 100644 --- a/server.lua +++ b/server.lua @@ -1,8 +1,6 @@ -ESX = nil local allReport = {} local items = {} -TriggerEvent(Config.ESXTrigger, function(obj) ESX = obj end) ESX.RegisterServerCallback('BahFaut:getUsergroup', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) @@ -318,4 +316,4 @@ function Ise_Logs3(webhook3, Color, Title, Description) } } PerformHttpRequest(webhook3, function(err, text, headers) end, 'POST', json.encode({username = Name, embeds = Content}), { ['Content-Type'] = 'application/json' }) -end \ No newline at end of file +end