From 29fbab3d46653b127a935969dad487ebf73e99c0 Mon Sep 17 00:00:00 2001 From: Kasey FItton Date: Sun, 15 Dec 2024 21:39:12 +0000 Subject: [PATCH 1/2] feat(es_extended/shared): add ox inventory detection back --- [core]/es_extended/shared/config/main.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/[core]/es_extended/shared/config/main.lua b/[core]/es_extended/shared/config/main.lua index 7db1e472..c87a9339 100644 --- a/[core]/es_extended/shared/config/main.lua +++ b/[core]/es_extended/shared/config/main.lua @@ -51,9 +51,13 @@ Config.DistanceGive = 4.0 -- Max distance when giving items, weapons etc. Config.AdminLogging = false -- Logs the usage of certain commands by those with group.admin ace permissions (default is false) --------------------------------------------------------------------- --- DO NOT CHANGE BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING --------------------------------------------------------------------- +------------------------------------- +-- DO NOT CHANGE BELOW THIS LINE !!! +------------------------------------- +if GetResourceState("ox_inventory") ~= "missing" then + Config.CustomInventory = "ox" +end + Config.EnableDefaultInventory = Config.CustomInventory == false -- Display the default Inventory ( F2 ) local txAdminLocale = GetConvar("txAdmin-locale", "en") From 11a26dc7af6c1614e10a01d13a4c5858f1fd2492 Mon Sep 17 00:00:00 2001 From: Kasey FItton Date: Sun, 15 Dec 2024 21:40:33 +0000 Subject: [PATCH 2/2] tweak(es_extended/shared/config/main): adjust comment --- [core]/es_extended/shared/config/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/shared/config/main.lua b/[core]/es_extended/shared/config/main.lua index c87a9339..f769f758 100644 --- a/[core]/es_extended/shared/config/main.lua +++ b/[core]/es_extended/shared/config/main.lua @@ -1,6 +1,6 @@ Config = {} --- for ox inventory, use Config.CustomInventory = "ox", for others, set to "resource_name" +-- for ox inventory, this will automatically be adjusted, do not change! for other inventories, change to "resource_name" Config.CustomInventory = false Config.Accounts = {