From 2dac6a532879f48e566c0558ed7cf2e79788e358 Mon Sep 17 00:00:00 2001
From: Arctos2win <116841243+Arctos2win@users.noreply.github.com>
Date: Thu, 25 Jan 2024 16:24:57 +0100
Subject: [PATCH 1/2] Remove checking for start in ox inventory state

---
 [core]/es_extended/client/common.lua | 2 +-
 [core]/es_extended/server/common.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[core]/es_extended/client/common.lua b/[core]/es_extended/client/common.lua
index 121de089e..71fe8b421 100644
--- a/[core]/es_extended/client/common.lua
+++ b/[core]/es_extended/client/common.lua
@@ -2,7 +2,7 @@ exports("getSharedObject", function()
     return ESX
 end)
 
-Config.OxInventory = GetResourceState("ox_inventory"):find("start") and true
+Config.OxInventory = GetResourceState("ox_inventory") ~= 'missing'
 
 AddEventHandler("esx:getSharedObject", function()
     local Invoke = GetInvokingResource()
diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
index 61ca163b8..58a731e67 100644
--- a/[core]/es_extended/server/common.lua
+++ b/[core]/es_extended/server/common.lua
@@ -27,7 +27,7 @@ exports("getSharedObject", function()
     return ESX
 end)
 
-if GetResourceState("ox_inventory"):find("start") then
+if GetResourceState("ox_inventory") ~= 'missing' then
     Config.OxInventory = true
     Config.PlayerFunctionOverride = "OxInventory"
     SetConvarReplicated("inventory:framework", "esx")

From 3f13bd57a24463462f3d0428286cfd6898cbb661 Mon Sep 17 00:00:00 2001
From: Arctos2win <116841243+Arctos2win@users.noreply.github.com>
Date: Thu, 25 Jan 2024 16:34:44 +0100
Subject: [PATCH 2/2] Put ox inventory back in the configuration

---
 [core]/es_extended/client/common.lua | 2 --
 [core]/es_extended/config.lua        | 2 ++
 [core]/es_extended/server/common.lua | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[core]/es_extended/client/common.lua b/[core]/es_extended/client/common.lua
index 71fe8b421..2191d17a2 100644
--- a/[core]/es_extended/client/common.lua
+++ b/[core]/es_extended/client/common.lua
@@ -2,8 +2,6 @@ exports("getSharedObject", function()
     return ESX
 end)
 
-Config.OxInventory = GetResourceState("ox_inventory") ~= 'missing'
-
 AddEventHandler("esx:getSharedObject", function()
     local Invoke = GetInvokingResource()
     print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))
diff --git a/[core]/es_extended/config.lua b/[core]/es_extended/config.lua
index 996377542..3020f0a26 100644
--- a/[core]/es_extended/config.lua
+++ b/[core]/es_extended/config.lua
@@ -1,6 +1,8 @@
 Config = {}
 Config.Locale = GetConvar("esx:locale", "en")
 
+Config.OxInventory = GetResourceState("ox_inventory") ~= 'missing' 
+
 Config.Accounts = {
     bank = {
         label = TranslateCap("account_bank"),
diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
index 58a731e67..68bc94c94 100644
--- a/[core]/es_extended/server/common.lua
+++ b/[core]/es_extended/server/common.lua
@@ -27,8 +27,7 @@ exports("getSharedObject", function()
     return ESX
 end)
 
-if GetResourceState("ox_inventory") ~= 'missing' then
-    Config.OxInventory = true
+if Config.OxInventory then
     Config.PlayerFunctionOverride = "OxInventory"
     SetConvarReplicated("inventory:framework", "esx")
     SetConvarReplicated("inventory:weight", Config.MaxWeight * 1000)