From 5842f3086583de4eb7bdf835a20aa526eb01481a Mon Sep 17 00:00:00 2001
From: TheFantomas <117121911+TheFantomas@users.noreply.github.com>
Date: Sun, 28 May 2023 13:29:18 +0200
Subject: [PATCH] revert "a969785d3697a384132202a07d4b357afb668048"

---
 [core]/es_extended/server/commands.lua  |  6 +-----
 [core]/es_extended/server/common.lua    | 20 +++++++++++++++++---
 [core]/es_extended/server/functions.lua | 20 --------------------
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua
index 142a7af1..c20edf68 100644
--- a/[core]/es_extended/server/commands.lua
+++ b/[core]/es_extended/server/commands.lua
@@ -281,11 +281,7 @@ end, true, {help = TranslateCap('command_clearall')})
 
 ESX.RegisterCommand("refreshjobs", 'admin', function(xPlayer, _, _)
 	ESX.RefreshJobs()
-end, true, {help = TranslateCap('command_refreshjobs')})
-
-ESX.RegisterCommand("refreshitems", 'admin', function(xPlayer, args, showError)
-	ESX.RefreshItems()
-end, true, {help = TranslateCap('command_refreshitems')})
+end, true, {help = TranslateCap('command_clearall')})
 
 if not Config.OxInventory then
 	ESX.RegisterCommand('clearinventory', 'admin', function(xPlayer, args, _)
diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
index 63b9fb9e..7e3d3ebb 100644
--- a/[core]/es_extended/server/common.lua
+++ b/[core]/es_extended/server/common.lua
@@ -40,11 +40,25 @@ end
 
 MySQL.ready(function()
 	Core.DatabaseConnected = true
+	if not Config.OxInventory then
+		local items = MySQL.query.await('SELECT * FROM items')
+		for k, v in ipairs(items) do
+			ESX.Items[v.name] = {label = v.label, weight = v.weight, rare = v.rare, canRemove = v.can_remove}
+		end
+	else
+		TriggerEvent('__cfx_export_ox_inventory_Items', function(ref)
+			if ref then
+				ESX.Items = ref()
+			end
+		end)
 
-	ESX.RefreshItems()
+		AddEventHandler('ox_inventory:itemList', function(items)
+			ESX.Items = items
+		end)
 
-	while not next(ESX.Items) do
-		Wait(0)
+		while not next(ESX.Items) do
+			Wait(0)
+		end
 	end
 
 	ESX.RefreshJobs()
diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
index 0591e8db..31b0c1a9 100644
--- a/[core]/es_extended/server/functions.lua
+++ b/[core]/es_extended/server/functions.lua
@@ -356,26 +356,6 @@ function ESX.RefreshJobs()
 	end
 end
 
-function ESX.RefreshItems()
-	if not Config.OxInventory then
-		ESX.Items = {}
-		local items = MySQL.query.await('SELECT * FROM items')
-		for k, v in ipairs(items) do
-			ESX.Items[v.name] = {label = v.label, weight = v.weight, rare = v.rare, canRemove = v.can_remove}
-		end
-	else
-		TriggerEvent('__cfx_export_ox_inventory_Items', function(ref)
-			if ref then
-				ESX.Items = ref()
-			end
-		end)
-
-		AddEventHandler('ox_inventory:itemList', function(items)
-			ESX.Items = items
-		end)
-	end
-end
-
 function ESX.RegisterUsableItem(item, cb)
 	Core.UsableItemsCallbacks[item] = cb
 end