crafter bug fixes

2018-02-26 05:12:17 -05:00
parent 1eaeed35c7
commit ea3258ed7e
2 changed files with 8 additions and 10 deletions
--- a/apps/Crafter.lua
+++ b/apps/Crafter.lua
@@ -72,14 +72,12 @@ local machines = { }
 local jobListGrid
 local listing, docked = false, false

-local function getItem(items, inItem, ignoreDamage)
+local function getItem(items, inItem, ignoreDamage, ignoreNbtHash)
  for _,item in pairs(items) do
-    if item.name == inItem.name then
-      if ignoreDamage then
-        return item
-      elseif item.damage == inItem.damage and item.nbtHash == inItem.nbtHash then
-        return item
-      end
+    if item.name == inItem.name and
+      (ignoreDamage or item.damage == inItem.damage) and
+      (ignoreNbtHash or item.nbtHash == inItem.nbtHash) then
+      return item
    end
  end
 end