diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 98a52a8..6146517 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -257,7 +257,7 @@ Framework.GetIsPlayerDead = function(src) local player = QBCore.Functions.GetPlayer(src) if not player then return end local playerData = player.PlayerData - return playerData.metadata.isdead or false + return playerData.metadata.isdead or playerData.metadata.inlaststand or false end diff --git a/modules/inventory/origen_inventory/server.lua b/modules/inventory/origen_inventory/server.lua index 4bc27d4..f567fb9 100644 --- a/modules/inventory/origen_inventory/server.lua +++ b/modules/inventory/origen_inventory/server.lua @@ -55,7 +55,6 @@ Inventory.GetPlayerInventory = function(src) local playerItems = origen_inventory:GetInventory(src) local repackedTable = {} for _, v in pairs(playerItems.inventory) do - print(json.encode(v, { indent = true })) table.insert(repackedTable, { name = v.name, count = v.count, diff --git a/modules/inventory/ox_inventory/server.lua b/modules/inventory/ox_inventory/server.lua index f277fa0..e2eb791 100644 --- a/modules/inventory/ox_inventory/server.lua +++ b/modules/inventory/ox_inventory/server.lua @@ -150,7 +150,6 @@ end ---@return string Inventory.GetImagePath = function(item) item = Inventory.StripPNG(item) - print(item) local file = LoadResourceFile("ox_inventory", string.format("web/images/%s.png", item)) local imagePath = file and string.format("nui://ox_inventory/web/images/%s.png", item) return imagePath or "https://avatars.githubusercontent.com/u/47620135" diff --git a/modules/inventory/qs-inventory/client.lua b/modules/inventory/qs-inventory/client.lua index 91a1671..9a0f0d1 100644 --- a/modules/inventory/qs-inventory/client.lua +++ b/modules/inventory/qs-inventory/client.lua @@ -1,6 +1,5 @@ if GetResourceState('qs-inventory') ~= 'started' then return end local quasar = exports["qs-inventory"] - Inventory = Inventory or {} ---comment @@ -14,8 +13,10 @@ end ---@param item string ---@return table Inventory.GetItemInfo = function(item) - local itemData = quasar:GetItemList() - if not itemData[item] then return {} end + local itemsData = quasar:GetItemList() + if not itemsData then return {} end + local itemData = itemsData[item] + if not itemData then return {} end local repackedTable = { name = itemData.name or "Missing Name", label = itemData.label or "Missing Label", diff --git a/modules/inventory/qs-inventory/server.lua b/modules/inventory/qs-inventory/server.lua index 699917f..0cbc1a8 100644 --- a/modules/inventory/qs-inventory/server.lua +++ b/modules/inventory/qs-inventory/server.lua @@ -127,8 +127,10 @@ end ---@param item string ---@return table Inventory.GetItemInfo = function(item) - local itemData = quasar:GetItemList() - if not itemData[item] then return {} end + local itemsData = quasar:GetItemList() + if not itemsData then return {} end + local itemData = itemsData[item] + if not itemData then return {} end local repackedTable = { name = itemData.name or "Missing Name", label = itemData.label or "Missing Label",