From 20cb92cd7da58f795e758482886f11b555ba01d2 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 19 Feb 2017 10:35:54 +1000 Subject: $ Added a Null check to getGregtechDust(), should now work as expected. (Should Fix #57). --- src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/Java/gtPlusPlus/core/util') diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java index da199c2be6..91b6835415 100644 --- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java +++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java @@ -256,11 +256,13 @@ public class ItemUtils { Utils.LOG_INFO(oredictName+" was not valid."); return null; } - + public static ItemStack getGregtechDust(Materials material, int amount){ ItemStack returnValue = GT_OreDictUnificator.get(OrePrefixes.dust, material, 1L); - if (returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass() || returnValue.getItem() != ModItems.AAA_Broken){ - return returnValue; + if (returnValue != null){ + if (returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass() || returnValue.getItem() != ModItems.AAA_Broken){ + return returnValue; + } } Utils.LOG_INFO(material+" was not valid."); return null; -- cgit