From 3746c49d49685e4a28afe82c392e72de30126227 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Thu, 29 May 2014 11:41:47 -0500 Subject: [PATCH] Fixed http://openeye.openmods.info/crashes/45620002c5dacfe15acc8e1e37187991 and friends. --- util/item/AEItemStack.java | 5 ++++- util/item/OreHelper.java | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/util/item/AEItemStack.java b/util/item/AEItemStack.java index 64e7d3f8c..1af8d3ce8 100644 --- a/util/item/AEItemStack.java +++ b/util/item/AEItemStack.java @@ -53,7 +53,10 @@ public final class AEItemStack extends AEStack implements IAEItemS def = new AEItemDef(); def.item = is.getItem(); - + + if ( def.item == null ) + throw new RuntimeException( "This ItemStack is bad, it has a null item." ); + /* * Prevent an Item from changing the damage value on me... Either, this or a core mod. */ diff --git a/util/item/OreHelper.java b/util/item/OreHelper.java index 2bb619363..802b7f257 100644 --- a/util/item/OreHelper.java +++ b/util/item/OreHelper.java @@ -98,7 +98,8 @@ public class OreHelper // SUMMON AE STACKS! for (ItemStack is : set) - aeset.add( AEItemStack.create( is ) ); + if ( is.getItem() != null ) + aeset.add( AEItemStack.create( is ) ); } }