fix(server/framework): handle item arrays for DoesPlayerHaveItem

overextended · Sep 12, 2023 · 7a6580a · 7a6580a
1 parent a7dea12
commit 7a6580a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/server/framework/es_extended.lua b/server/framework/es_extended.lua
@@ -14,21 +14,24 @@ SetTimeout(0, function()
             if player then player.removeInventoryItem(item, 1) end
         end
 
-        function DoesPlayerHaveItem(player, items)
+        ---@param player table
+        ---@param items string[] | { name: string, remove?: boolean, metadata?: string }[]
+        ---@param removeItem? boolean
+        ---@return string?
+        function DoesPlayerHaveItem(player, items, removeItem)
             for i = 1, #items do
                 local item = items[i]
-                local data = player.getInventoryItem(item.name)
+                local itemName = item.name or item
+                local data = player.getInventoryItem(itemName)
 
                 if data?.count > 0 then
-                    if item.remove then
-                        player.removeInventoryItem(item.name, 1)
+                    if removeItem or item.remove then
+                        player.removeInventoryItem(itemName, 1)
                     end
 
-                    return item.name
+                    return itemName
                 end
             end
-
-            return false
         end
     end
 end)

diff --git a/server/framework/qb-core.lua b/server/framework/qb-core.lua
@@ -14,33 +14,38 @@ SetTimeout(0, function()
             if player then player.Functions.RemoveItem(item, 1, slot) end
 		end
 
-		function DoesPlayerHaveItem(player, items)
+		---@param player table
+		---@param items string[] | { name: string, remove?: boolean, metadata?: string }[]
+		---@param removeItem? boolean
+		---@return string?
+		function DoesPlayerHaveItem(player, items, removeItem)
 			for i = 1, #items do
 				local item = items[i]
+                local itemName = item.name or item
 
 				if item.metadata then
-					local playerItems = player.Functions.GetItemsByName(item.name)
+					local playerItems = player.Functions.GetItemsByName(itemName)
 
 					for j = 1, #playerItems do
 						local data = playerItems[j]
 
 						if data.info.type == item.metadata then
-							if item.remove then
-								player.Functions.RemoveItem(item.name, 1, data.slot)
+							if removeItem or item.remove then
+								player.Functions.RemoveItem(itemName, 1, data.slot)
 							end
 
-							return item.name
+							return itemName
 						end
 					end
 				else
-					local data = player.Functions.GetItemByName(item.name)
+					local data = player.Functions.GetItemByName(itemName)
 
 					if data then
 						if item.remove then
-							player.Functions.RemoveItem(item.name, 1, data.slot)
+							player.Functions.RemoveItem(itemName, 1, data.slot)
 						end
 
-						return item.name
+						return itemName
 					end
 				end
 			end

diff --git a/server/main.lua b/server/main.lua
@@ -173,9 +173,9 @@ end
 
 ---@param player table
 ---@param items string[] | { name: string, remove?: boolean, metadata?: string }[]
----@param alwaysRemove? boolean
+---@param removeItem? boolean
 ---@return string?
-function DoesPlayerHaveItem(player, items, alwaysRemove)
+function DoesPlayerHaveItem(player, items, removeItem)
 	local playerId = player.source or player.PlayerData.source
 
 	for i = 1, #items do
@@ -184,7 +184,7 @@ function DoesPlayerHaveItem(player, items, alwaysRemove)
 		local data = ox_inventory:Search(playerId, 'slots', itemName, item.metadata)[1]
 
 		if data and data.count > 0 then
-			if alwaysRemove or item.remove then
+			if removeItem or item.remove then
 				ox_inventory:RemoveItem(playerId, itemName, 1, nil, data.slot)
 			end