Skip to content

Commit

Permalink
refactor: use qbCoreCompat for shared items
Browse files Browse the repository at this point in the history
  • Loading branch information
solareon committed Aug 9, 2024
1 parent f045a30 commit 9c00967
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions bridge/qb/server/functions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,13 @@ local function AddItem(itemName, item)
return false, 'invalid_item_name'
end

if QBX.Shared.Items[itemName] then
if qbCoreCompat.Shared.Items[itemName] then
return false, 'item_exists'
end

QBX.Shared.Items[itemName] = item
lib.print.warn(('New item %s added but not found in ox_inventory. Printing item data'):format(itemName))
lib.print.warn(item)
qbCoreCompat.Shared.Items[itemName] = item

TriggerClientEvent('QBCore:Client:OnSharedUpdate', -1, 'Items', itemName, item)
TriggerEvent('QBCore:Server:UpdateObject')
Expand All @@ -160,10 +162,10 @@ local function UpdateItem(itemName, item)
if type(itemName) ~= 'string' then
return false, 'invalid_item_name'
end
if not QBX.Shared.Items[itemName] then
if not qbCoreCompat.Shared.Items[itemName] then
return false, 'item_not_exists'
end
QBX.Shared.Items[itemName] = item
qbCoreCompat.Shared.Items[itemName] = item
TriggerClientEvent('QBCore:Client:OnSharedUpdate', -1, 'Items', itemName, item)
TriggerEvent('QBCore:Server:UpdateObject')
return true, 'success'
Expand All @@ -188,14 +190,16 @@ local function AddItems(items)
break
end

if QBX.Shared.Items[key] then
if qbCoreCompat.Shared.Items[key] then
message = 'item_exists'
shouldContinue = false
errorItem = items[key]
break
end
lib.print.warn(('New item %s added but not found in ox_inventory. Printing item data'):format(key))
lib.print.warn(value)

QBX.Shared.Items[key] = value
qbCoreCompat.Shared.Items[key] = value
end

if not shouldContinue then return false, message, errorItem end
Expand All @@ -215,11 +219,11 @@ local function RemoveItem(itemName)
return false, 'invalid_item_name'
end

if not QBX.Shared.Items[itemName] then
if not qbCoreCompat.Shared.Items[itemName] then
return false, 'item_not_exists'
end

QBX.Shared.Items[itemName] = nil
qbCoreCompat.Shared.Items[itemName] = nil

TriggerClientEvent('QBCore:Client:OnSharedUpdate', -1, 'Items', itemName, nil)
TriggerEvent('QBCore:Server:UpdateObject')
Expand Down

0 comments on commit 9c00967

Please sign in to comment.