From 6be5fd547830f50e8704809b76a83bd7c8f58b9c Mon Sep 17 00:00:00 2001
From: Cyzxin <maxfoley1506@icloud.com>
Date: Mon, 22 May 2023 09:47:07 +0100
Subject: [PATCH 1/3] Fixed Translation For RefreshJob Command

Added /refreshitems To Update The ESX.Items Table
---
 [core]/es_extended/locales/en.lua       | 2 ++
 [core]/es_extended/server/commands.lua  | 6 +++++-
 [core]/es_extended/server/functions.lua | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[core]/es_extended/locales/en.lua b/[core]/es_extended/locales/en.lua
index e480153f..8355c378 100644
--- a/[core]/es_extended/locales/en.lua
+++ b/[core]/es_extended/locales/en.lua
@@ -108,6 +108,8 @@ Locales['en'] = {
   ['command_giveammo_noweapon_found'] = '%s does not have that weapon',
   ['command_giveammo_weapon'] = 'Weapon name',
   ['command_giveammo_ammo'] = 'Ammo Quantity',
+  ['command_refreshjobs'] = 'Refresh The ESX Jobs Table',
+  ['command_refreshitems'] = 'Refresh The ESX Items Table',
   ['tpm_nowaypoint'] = 'No Waypoint Set.',
   ['tpm_success'] = 'Successfully Teleported',
 
diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua
index b89ae36a..ad1cf9e8 100644
--- a/[core]/es_extended/server/commands.lua
+++ b/[core]/es_extended/server/commands.lua
@@ -184,7 +184,11 @@ end, true, {help = TranslateCap('command_clearall')})
 
 ESX.RegisterCommand("refreshjobs", 'admin', function(xPlayer, args, showError)
 	ESX.RefreshJobs()
-end, true, {help = TranslateCap('command_clearall')})
+end, true, {help = TranslateCap('command_refreshjobs')})
+
+ESX.RegisterCommand("refreshitems", 'admin', function(xPlayer, args, showError)
+	ESX.RefreshItems()
+end, true, {help = TranslateCap('command_refreshitems')})
 
 if not Config.OxInventory then
 	ESX.RegisterCommand('clearinventory', 'admin', function(xPlayer, args, showError)
diff --git a/[core]/es_extended/server/functions.lua b/[core]/es_extended/server/functions.lua
index 202e1b5e..2ed4b802 100644
--- a/[core]/es_extended/server/functions.lua
+++ b/[core]/es_extended/server/functions.lua
@@ -348,6 +348,14 @@ function ESX.RefreshJobs()
   end
 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 
+end
+
 function ESX.RegisterUsableItem(item, cb)
   Core.UsableItemsCallbacks[item] = cb
 end

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 2/3] 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)

From 9ee4bcddf1b2fb5f644cfdcf65409b99665ec1e7 Mon Sep 17 00:00:00 2001
From: Thekuca <63980591+Thekuca@users.noreply.github.com>
Date: Tue, 23 May 2023 11:29:50 +0200
Subject: [PATCH 3/3] Update common.lua

---
 [core]/es_extended/server/common.lua | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
index 7e3d3ebb..63b9fb9e 100644
--- a/[core]/es_extended/server/common.lua
+++ b/[core]/es_extended/server/common.lua
@@ -40,25 +40,11 @@ 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)
 
-		AddEventHandler('ox_inventory:itemList', function(items)
-			ESX.Items = items
-		end)
+	ESX.RefreshItems()
 
-		while not next(ESX.Items) do
-			Wait(0)
-		end
+	while not next(ESX.Items) do
+		Wait(0)
 	end
 
 	ESX.RefreshJobs()