From 6a3041524a406589c006427fd2b5c65ee8b4d7ba Mon Sep 17 00:00:00 2001 From: Jim Shield Date: Wed, 7 May 2025 16:38:57 +0100 Subject: [PATCH] Re-add old qb-inv support for `canCarry()` When updating to use the new export for qb-inv, I accidently removed the old functions, this readds them and fixes support for it --- shared/itemcontrol.lua | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/shared/itemcontrol.lua b/shared/itemcontrol.lua index db43311..e67f1d9 100644 --- a/shared/itemcontrol.lua +++ b/shared/itemcontrol.lua @@ -626,8 +626,25 @@ function canCarry(itemTable, src) end elseif isStarted(QBInv) then - for k, v in pairs(itemTable) do - resultTable[k] = exports[QBInv]:CanAddItem(src, k, v) + if QBInvNew then + for k, v in pairs(itemTable) do + resultTable[k] = exports[QBInv]:CanAddItem(src, k, v) + end + else + local items = getPlayerInv(src) + local totalWeight = 0 + if not items then return false end + for _, item in pairs(items) do + totalWeight += (item.weight * item.amount) + end + for k, v in pairs(itemTable) do + local itemInfo = Items[k] + if not itemInfo and not Player.Offline then + resultTable[k] = true + else + resultTable[k] = (totalWeight + (itemInfo.weight * v)) <= InventoryWeight + end + end end elseif isStarted(PSInv) then