Merge pull request #132 from thelindat/main

Improve ox_inventory compatibility

[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
+	if not ESX.GetConfig().OxInventory then
-		xPlayer.setMaxWeight(defaultMaxWeight + backpackModifier)
+		local defaultMaxWeight = ESX.GetConfig().MaxWeight
-	else
+		local backpackModifier = Config.BackpackWeight[skin.bags_1]
-		xPlayer.setMaxWeight(defaultMaxWeight)
+
+		if backpackModifier then
+			xPlayer.setMaxWeight(defaultMaxWeight + backpackModifier)
+		else
+			xPlayer.setMaxWeight(defaultMaxWeight)
+		end
 	end
 
 	MySQL.update('UPDATE users SET skin = @skin WHERE identifier = @identifier', {

[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)