starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 09:18:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #132 from thelindat/main

Browse Source 
Improve ox_inventory compatibility
This commit is contained in:
Mycroft
2022-03-02 23:09:03 +00:00
committed by GitHub
parent fd648a6f7e ee0ac2d68e
commit ba534fade4
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx]/esx_skin/server/main.lua
+9 -6
View File
@@ -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', {
[esx_addons]/esx_property/server/main.lua
+11
View File
@@ -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)