From 4d1a3cadd65ea78f561b58303186ae4d6243e6a1 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 1 Dec 2017 13:08:31 +0100 Subject: [PATCH] Extra check in autocrafting --- .../apiimpl/autocrafting/CraftingPattern.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java index 77a8e4ed6..3cbd50971 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java @@ -99,15 +99,15 @@ public class CraftingPattern implements ICraftingPattern { if (oreInputs.isEmpty()) { for (ItemStack input : inputs) { - if (input == null) { + if (input == null || input.isEmpty()) { oreInputs.add(Collections.emptyList()); - } else if (!input.isEmpty()) { + } else { int[] ids = OreDictionary.getOreIDs(input); if (ids.length == 0) { oreInputs.add(Collections.singletonList(Comparer.stripTags(input))); } else if (isOredict()) { - List oredict = Arrays.stream(ids) + List oredictInputs = Arrays.stream(ids) .mapToObj(OreDictionary::getOreName) .map(OreDictionary::getOres) .flatMap(List::stream) @@ -117,9 +117,9 @@ public class CraftingPattern implements ICraftingPattern { .collect(Collectors.toList()); // Add original stack as first, should prevent some issues - oredict.add(0, Comparer.stripTags(input.copy())); + oredictInputs.add(0, Comparer.stripTags(input.copy())); - oreInputs.add(oredict); + oreInputs.add(oredictInputs); } else { oreInputs.add(Collections.singletonList(Comparer.stripTags(input))); }