Update itemcontrol.lua

This commit is contained in:
Jim Shield
2025-10-03 17:44:29 +01:00
parent 672dd7684b
commit 0bc3c0f9b4

View File

@@ -1338,10 +1338,12 @@ end
--- ``` --- ```
function getPlayerInv(src) function getPlayerInv(src)
local grabInv = nil local grabInv = nil
local foundInv = ""
for i = 1, #InvFunc do for i = 1, #InvFunc do
local inv = InvFunc[i] local inv = InvFunc[i]
if isStarted(inv.invName) then if isStarted(inv.invName) then
foundInv = inv.invName
grabInv = inv.getPlayerInv(src) grabInv = inv.getPlayerInv(src)
break break
end end
@@ -1364,6 +1366,7 @@ function getPlayerInv(src)
grabInv = xPlayer and xPlayer.inventory or {} grabInv = xPlayer and xPlayer.inventory or {}
end end
end end
--jsonPrint(grabInv)
end end
if grabInv == nil then if grabInv == nil then
@@ -1958,7 +1961,7 @@ function getCurrentInvWeight(src)
if weight == 0 then if weight == 0 then
local itemcheck = getPlayerInv(src) local itemcheck = getPlayerInv(src)
for _, v in pairs(itemcheck) do for _, v in pairs(itemcheck) do
weight += ((v.weight * v.amount) or 0) weight += ((v.weight * (v.amount or v.count)) or 0)
end end
end end
return weight return weight
@@ -2356,6 +2359,8 @@ function stashRemoveItem(stashItems, stashName, items)
return return
end end
end end
-- Fallback to core functions
if isStarted(QBExport) then if isStarted(QBExport) then
local stashItems = getStash(stashName[1]) local stashItems = getStash(stashName[1])
for k, v in pairs(items) do for k, v in pairs(items) do
@@ -2382,6 +2387,10 @@ function stashRemoveItem(stashItems, stashName, items)
end end
RegisterNetEvent(getScript()..":server:stashRemoveItem", stashRemoveItem) RegisterNetEvent(getScript()..":server:stashRemoveItem", stashRemoveItem)
function stashAddItem(stashItems, stashName, items)
-- wip
end
------------------------------------------------------------- -------------------------------------------------------------
-- Stash Item Availability Check -- Stash Item Availability Check
------------------------------------------------------------- -------------------------------------------------------------