Merge pull request esx-framework#1293 from Arctos2win/main

Fix for ox inventory
1nexis · Jan 25, 2024 · d41ac35 · d41ac35
2 parents 8a91473 + 3f13bd5
commit d41ac35
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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"):find("start") and true
-
 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
@@ -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
@@ -27,8 +27,7 @@ exports("getSharedObject", function()
     return ESX
 end)
 
-if GetResourceState("ox_inventory"):find("start") then
-    Config.OxInventory = true
+if Config.OxInventory then
     Config.PlayerFunctionOverride = "OxInventory"
     SetConvarReplicated("inventory:framework", "esx")
     SetConvarReplicated("inventory:weight", Config.MaxWeight * 1000)