From a2a25626d44923441e0c761a9cf98379e7862b24 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 28 Feb 2015 17:31:50 -0500 Subject: [PATCH] Fixed the routing limits so that they now work for >=64 limits. --- .../common/spell/complex/effect/SpellHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java index 0ec8a551..d1ee18de 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java @@ -462,7 +462,7 @@ public class SpellHelper boolean tagsEqual = ItemStack.areItemStackTagsEqual(stack1, stack2); - return stack1.getItem() == stack2.getItem() && tagsEqual && stack1.getItemDamage() == stack2.getItemDamage() && Math.min(stack2.getMaxStackSize() - stack2.stackSize, stack1.stackSize) > 0; + return stack1.getItem() == stack2.getItem() && tagsEqual && stack1.getItemDamage() == stack2.getItemDamage(); } /** @@ -605,13 +605,13 @@ public class SpellHelper } ItemStack invStack = inventory.getStackInSlot(i); - + if(invStack != null && canCombine(stack, invStack)) { numberMatching += invStack.stackSize; } } - + if(numberMatching >= limit) { return stack;