Fixed inventory.HasItemOfBase and inventory.HasItem returning prematu…

…rely.
NebulousCloud · Aug 19, 2018 · 1f0ab0a · 1f0ab0a
1 parent 1aeccf8
commit 1f0ab0a
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/gamemode/core/meta/sh_inventory.lua b/gamemode/core/meta/sh_inventory.lua
@@ -342,12 +342,18 @@ function META:HasItem(targetID, data)
 		if (v.uniqueID == targetID) then
 			if (data) then
 				local itemData = v.data
+				local bFound = true
 
 				for dataKey, dataVal in pairs(data) do
 					if (itemData[dataKey] != dataVal) then
-						return false
+						bFound = false
+						break
 					end
 				end
+
+				if (!bFound) then
+					continue
+				end
 			end
 
 			return v
@@ -364,12 +370,18 @@ function META:HasItemOfBase(baseID, data)
 		if (v.base == baseID) then
 			if (data) then
 				local itemData = v.data
+				local bFound = true
 
 				for dataKey, dataVal in pairs(data) do
 					if (itemData[dataKey] != dataVal) then
-						return false
+						bFound = false
+						break
 					end
 				end
+
+				if (!bFound) then
+					continue
+				end
 			end
 
 			return v