diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2017-02-19 10:35:54 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2017-02-19 10:35:54 +1000 |
| commit | 20cb92cd7da58f795e758482886f11b555ba01d2 (patch) | |
| tree | d61a0c6d7880dc947885855710d123ce1b85c8c1 /src/Java/gtPlusPlus/core/util | |
| parent | e6daa173c0a6ba75c2ecd61704ac4fa91aa999e9 (diff) | |
| download | GT5-Unofficial-20cb92cd7da58f795e758482886f11b555ba01d2.tar.gz GT5-Unofficial-20cb92cd7da58f795e758482886f11b555ba01d2.tar.bz2 GT5-Unofficial-20cb92cd7da58f795e758482886f11b555ba01d2.zip | |
$ Added a Null check to getGregtechDust(), should now work as expected. (Should Fix #57).
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 8 |
1 files changed, 5 insertions, 3 deletions
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; |