- fix ox compat

- fix getNearbyPlayers for qbx

Author: Mustachedom

bridge/framework/qbx/server.lua

@@ -237,12 +237,12 @@ function ps.getNearbyPlayers(source, distance)
     if not distance then distance = 10.0 end
     local players = {}
     for k, v in pairs(ps.getAllPlayers()) do
-        local dist = #(GetEntityCoords(GetPlayerPed(v)) - GetEntityCoords(GetPlayerPed(source)))
+        local dist = #(GetEntityCoords(GetPlayerPed(v.PlayerData.source)) - GetEntityCoords(GetPlayerPed(source)))
         if dist < 5.0 then
             table.insert(players, {
-                value = ps.getIdentifier(v),
-                label = ps.getPlayerName(v),
-                source = v,
+                value = ps.getIdentifier(v.PlayerData.source),
+                label = ps.getPlayerName(v.PlayerData.source),
+                source = v.PlayerData.source,
                 distance = dist,
             })
         end
@@ -551,7 +551,7 @@ end
 function ps.getSharedJobGradeData(job, rank, data)
     local jobData = ps.getSharedJob(job)
     if not jobData then return nil end
-    local gradeData = jobData.grades[tostring(rank)]
+    local gradeData = jobData.grades[tonumber(rank)]
     if not gradeData then return nil end
     return gradeData[data] or nil
 end
@@ -569,9 +569,9 @@ function ps.getSharedGangData(gang, data)
 end
 
 function ps.getSharedGangRankData(gang, rank, data)
-    local gangData = QBCore.Shared.Gangs[gang]
+    local gangData = exports.qbx_core:GetGangs()[gang]
     if not gangData then return nil end
-    local gradeData = gangData.grades[tostring(rank)]
+    local gradeData = gangData.grades[tonumber(rank)]
     if not gradeData then return nil end
     return gradeData[data] or nil
 end

bridge/inventory/ox/client/ox.lua

@@ -47,14 +47,6 @@ function ps.hasItems(items)
 end
 
 RegisterNetEvent('ps_lib:client:createShop', function(shopData)
-    if not shopData.name then shopData.name = 'Shop' end
-    if not shopData.slots then shopData.slots = 50 end
-    if not shopData.maxweight then shopData.maxweight = 100000 end
-    exports.ox_inventory:RegisterShop(shopData.name, {
-        name = shopData.name,
-        slots = shopData.slots,
-        maxweight = shopData.maxweight,
-        items = shopData.items or {},
-    })
+    if not shopData then shopData.name = 'Shop' end
     exports.ox_inventory:openInventory('shop', { type = shopData, id = shopData })
 end)

bridge/inventory/ox/server/ox.lua

@@ -2,7 +2,8 @@
 function ps.CanCarryItem(source, item, amount)
     if not source or not item then return end
     if not amount then amount = 1 end
-    return exports.ox_inventory:CanCarryItem(source, item, amount)
+    local can = exports.ox_inventory:CanCarryItem(source, item, amount)
+    return can
 end
 
 function ps.removeItem(identifier, item, amount, slot, reason)
@@ -86,15 +87,14 @@ function ps.createShop(source, shopData)
 end
 
 function ps.verifyRecipe(source, recipe)
-    if not source or not recipe then return false end
-    local requiredItems = recipe.requiredItems or {}
-    for item, amount in pairs(requiredItems) do
-        if not ps.hasItem(source, item, amount) then
-            ps.notify(source, 'You need ' .. amount .. ' ' .. ps.getLabel(item) .. ' to craft this.', 'error')
-            return false
+    local need, have = 0,0
+    for k, v in pairs (recipe) do
+        if ps.getItemCount(source, k) >= v then
+            have = have + 1
         end
+        need = need + 1
     end
-    return true
+    return have >= need
 end
 
 function ps.craftItem(source, recipe)

fxmanifest.lua

@@ -10,7 +10,7 @@ description 'Project Sloth Library'
 author 'Project Sloth'
 
 client_scripts {
-    --'@qbx_core/modules/playerdata.lua',
+    '@qbx_core/modules/playerdata.lua',
     'startFirst/client/**.lua',
     'modules/**/client/**.lua',
     'bridge/client.lua',
@@ -26,7 +26,7 @@ server_scripts {
 shared_scripts {
     'Config.lua',
     'startFirst/shared/**.lua',
-    --'@ox_lib/init.lua',
+    '@ox_lib/init.lua',
     'modules/**/shared/**.lua',
     'init.lua'
 }