From fab8f3aa741ceb740eb0371808502e49032069be Mon Sep 17 00:00:00 2001
From: Thekuca <63980591+Thekuca@users.noreply.github.com>
Date: Tue, 23 May 2023 11:28:09 +0200
Subject: [PATCH] Update functions.lua

---
 [core]/es_extended/server/functions.lua | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
index 094f3162..0591e8db 100644
--- a/[core]/es_extended/server/functions.lua
+++ b/[core]/es_extended/server/functions.lua
@@ -357,11 +357,23 @@ function ESX.RefreshJobs()
 end
 
 function ESX.RefreshItems()
-  if Config.OxInventory then return end
-  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 
+	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)