From 18b1eb61c6d72ef21aad586820551eacfc102356 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Mon, 20 Jun 2022 06:15:12 +1000 Subject: [PATCH] fix(esx/server): xPlayer.getInventory return using ox_inventory This iteration should only occur when passing a truthy argument, otherwise return the full table as-is. Function was broken during overrides commit. --- .../server/classes/overrides/oxinventory.lua | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/[esx]/es_extended/server/classes/overrides/oxinventory.lua b/[esx]/es_extended/server/classes/overrides/oxinventory.lua index dcc5ceb8..b1178e30 100644 --- a/[esx]/es_extended/server/classes/overrides/oxinventory.lua +++ b/[esx]/es_extended/server/classes/overrides/oxinventory.lua @@ -8,27 +8,31 @@ end Core.PlayerFunctionOverrides.OxInventory = { getInventory = function(self) - return function() - local res = {} + return function(minimal) + if minimal then + local minimalInventory = {} - for k, v in pairs(self.inventory) do - if v.count and v.count > 0 then - local metadata = v.metadata + for k, v in pairs(self.inventory) do + if v.count and v.count > 0 then + local metadata = v.metadata - if v.metadata and next(v.metadata) == nil then - metadata = nil + if v.metadata and next(v.metadata) == nil then + metadata = nil + end + + minimalInventory[#minimalInventory+1] = { + name = v.name, + count = v.count, + slot = k, + metadata = metadata + } end - - res[#res+1] = { - name = v.name, - count = v.count, - slot = k, - metadata = metadata - } end + + return minimalInventory end - return res + return self.inventory end end,