lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed the routing limits so that they now work for >=64 limits.

Browse source
This commit is contained in:
WayofTime 2015-02-28 17:31:50 -05:00
parent edc0e5cd9a
commit a2a25626d4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java
View file

@ -462,7 +462,7 @@ public class SpellHelper
boolean tagsEqual = ItemStack.areItemStackTagsEqual(stack1, stack2); 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); ItemStack invStack = inventory.getStackInSlot(i);
if(invStack != null && canCombine(stack, invStack)) if(invStack != null && canCombine(stack, invStack))
{ {
numberMatching += invStack.stackSize; numberMatching += invStack.stackSize;
} }
} }
if(numberMatching >= limit) if(numberMatching >= limit)
{ {
return stack; return stack;