From a2b293d1460f4ae85ab5994a2d3ca9c184808130 Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Sun, 27 Feb 2022 07:36:19 +1100
Subject: [PATCH 1/2] fix(property/server): RegisterStash on inventory restart

---
 [esx_addons]/esx_property/server/main.lua | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/[esx_addons]/esx_property/server/main.lua b/[esx_addons]/esx_property/server/main.lua
index c81d09f8..f21c2d70 100644
--- a/[esx_addons]/esx_property/server/main.lua
+++ b/[esx_addons]/esx_property/server/main.lua
@@ -142,6 +142,17 @@ MySQL.ready(function()
 	end)
 end)
 
+if Config.OxInventory then
+	AddEventHandler('onServerResourceStart', function(resource)
+		if resource == 'ox_inventory' then
+			for i=1, #Config.Properties do
+				local property = Config.Properties[i]
+				exports.ox_inventory:RegisterStash(property.name, property.label, 50, 100000, true)
+			end
+		end
+	end)
+end
+
 ESX.RegisterServerCallback('esx_property:getProperties', function(source, cb)
 	cb(Config.Properties)
 end)

From ee0ac2d68e567f406844559973ef8288f5ba4f77 Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Wed, 2 Mar 2022 14:29:14 +1100
Subject: [PATCH 2/2] fix(skin): disable setMaxWeight when using ox inventory

---
 [esx]/esx_skin/server/main.lua | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/[esx]/esx_skin/server/main.lua b/[esx]/esx_skin/server/main.lua
index 18460ca2..88fea687 100644
--- a/[esx]/esx_skin/server/main.lua
+++ b/[esx]/esx_skin/server/main.lua
@@ -1,13 +1,16 @@
 RegisterServerEvent('esx_skin:save')
 AddEventHandler('esx_skin:save', function(skin)
 	local xPlayer = ESX.GetPlayerFromId(source)
-	local defaultMaxWeight = ESX.GetConfig().MaxWeight
-	local backpackModifier = Config.BackpackWeight[skin.bags_1]
 
-	if backpackModifier then
-		xPlayer.setMaxWeight(defaultMaxWeight + backpackModifier)
-	else
-		xPlayer.setMaxWeight(defaultMaxWeight)
+	if not ESX.GetConfig().OxInventory then
+		local defaultMaxWeight = ESX.GetConfig().MaxWeight
+		local backpackModifier = Config.BackpackWeight[skin.bags_1]
+
+		if backpackModifier then
+			xPlayer.setMaxWeight(defaultMaxWeight + backpackModifier)
+		else
+			xPlayer.setMaxWeight(defaultMaxWeight)
+		end
 	end
 
 	MySQL.update('UPDATE users SET skin = @skin WHERE identifier = @identifier', {