keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Merge pull request #1953 from ganymedes01/patch-1

Browse source 
Fixed NPE when calling canBrew
This commit is contained in:
LexManos 2015-06-18 11:51:48 -07:00
commit 40bc035d74
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/minecraftforge/common/brewing/VanillaBrewingRecipe.java
View file

@ -40,7 +40,7 @@ public class VanillaBrewingRecipe implements IBrewingRecipe {
@Override
public ItemStack getOutput(ItemStack input, ItemStack ingredient)
{
if (ingredient != null && input != null && input.getItem() instanceof ItemPotion)
if (ingredient != null && input != null && input.getItem() instanceof ItemPotion && isIngredient(ingredient))
{
int inputMeta = input.getMetadata();
int outputMeta = PotionHelper.applyIngredient(inputMeta, ingredient.getItem().getPotionEffect(ingredient));
@ -72,4 +72,4 @@ public class VanillaBrewingRecipe implements IBrewingRecipe {
return null;
}
}
}