From c3b665f29e5a41509251f744b2bffbad2a27d004 Mon Sep 17 00:00:00 2001
From: rbarra <82441559+FlawetDev@users.noreply.github.com>
Date: Mon, 26 Feb 2024 18:51:33 +0100
Subject: [PATCH 1/4] fix: updates for new esx

---
 config.lua     | 2 +-
 fxmanifest.lua | 5 ++++-
 report.lua     | 9 ---------
 server.lua     | 2 +-
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/config.lua b/config.lua
index 706bc86..c52b3ee 100644
--- a/config.lua
+++ b/config.lua
@@ -2,7 +2,7 @@ Config = {}
 
 Config = {
     ------------
-    ESXTrigger = "esx:getSharedObject",
+    ESXTrigger =  exports["es_extended"]: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..59fa066 100644
--- a/server.lua
+++ b/server.lua
@@ -1,4 +1,4 @@
-ESX = nil
+ESX = exports["es_extended"]:getSharedObject()
 local allReport = {}
 local items = {}
 

From de85a7934a5e7ab2ad31973962795a76fc79313d Mon Sep 17 00:00:00 2001
From: rbarra <82441559+FlawetDev@users.noreply.github.com>
Date: Mon, 26 Feb 2024 23:56:28 +0100
Subject: [PATCH 2/4] update for compatibility with new esx

---
 client.lua | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

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)

From 8389ed6ebeb037e2380ee8873965ac61c0d7ded3 Mon Sep 17 00:00:00 2001
From: rbarra <82441559+FlawetDev@users.noreply.github.com>
Date: Mon, 26 Feb 2024 23:56:41 +0100
Subject: [PATCH 3/4] Update config.lua

---
 config.lua | 2 --
 1 file changed, 2 deletions(-)

diff --git a/config.lua b/config.lua
index c52b3ee..937b403 100644
--- a/config.lua
+++ b/config.lua
@@ -1,8 +1,6 @@
 Config = {}
 
 Config = {
-    ------------
-    ESXTrigger =  exports["es_extended"]:getSharedObject(),
     ------------
     ColorMenuR = 255, -- Bannière couleur R
     ColorMenuG = 11, -- Bannière couleur G

From d812609b7885ac734851358ff56820f01ebe0be4 Mon Sep 17 00:00:00 2001
From: rbarra <82441559+FlawetDev@users.noreply.github.com>
Date: Mon, 26 Feb 2024 23:57:01 +0100
Subject: [PATCH 4/4] Update server.lua

---
 server.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/server.lua b/server.lua
index 59fa066..e1188db 100644
--- a/server.lua
+++ b/server.lua
@@ -1,8 +1,6 @@
-ESX = exports["es_extended"]:getSharedObject()
 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