From 2bc4c26c9723ffa3ebc07042d43b48f01f0ee851 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 18 Apr 2015 17:49:53 +0100 Subject: [PATCH] Null check the ItemStack and its Item for RecipePureDaisy.isOreDict. --- src/main/java/vazkii/botania/api/package-info.java | 2 +- src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index c7b03fad4..b56e7675d 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "41", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "42", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index 90c871a77..866a1de05 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -46,6 +46,9 @@ public class RecipePureDaisy { } public boolean isOreDict(ItemStack stack, String entry) { + if(stack == null || stack.getItem() == null) + return false; + for(ItemStack ostack : OreDictionary.getOres(entry)) { ItemStack cstack = ostack.copy(); if(cstack.getItemDamage() == Short.MAX_VALUE)