Merge pull request #239 from hilburn/mt-fix

Shapeless Blood Orb Recipe fix
This commit is contained in:
WayofTime 2015-02-01 10:41:16 -05:00
commit 9e0e90d6e2

View file

@ -39,12 +39,17 @@ public class ShapelessBloodOrbRecipe implements IRecipe
output = result.copy();
for (Object in : recipe)
{
if (in instanceof ItemStack)
{
input.add(((ItemStack) in).copy());
} else if (in instanceof IBloodOrb)
if (in instanceof IBloodOrb)
{ //If the item is an instanceof IBloodOrb then save the level of the orb
input.add((Integer) (((IBloodOrb) in).getOrbLevel()));
}
else if (in instanceof ItemStack)
{
if (((ItemStack)in).getItem() instanceof IBloodOrb)
{
input.add((Integer) (((IBloodOrb) ((ItemStack)in).getItem()).getOrbLevel()));
}
else input.add(((ItemStack) in).copy());
} else if (in instanceof Item)
{
input.add(new ItemStack((Item) in));
@ -137,6 +142,7 @@ public class ShapelessBloodOrbRecipe implements IRecipe
return false;
}
} else return false;
match = true;
} else if (next instanceof ItemStack)
{
match = OreDictionary.itemMatches((ItemStack) next, slot, false);