Added NPE Filters.

This commit is contained in:
AlgorithmX2
2014-07-28 20:57:46 -05:00
parent de408931af
commit 6e804877de
+6 -2
View File
@@ -33,6 +33,9 @@ public class OreDictionaryHandler
@SubscribeEvent @SubscribeEvent
public void onOreDictionaryRegister(OreDictionary.OreRegisterEvent event) public void onOreDictionaryRegister(OreDictionary.OreRegisterEvent event)
{ {
if ( event.Name == null || event.Ore == null )
return;
if ( shouldCare( event.Name ) ) if ( shouldCare( event.Name ) )
{ {
for (IOreListener v : ol) for (IOreListener v : ol)
@@ -56,11 +59,12 @@ public class OreDictionaryHandler
// notify the listener of any ore already in existance. // notify the listener of any ore already in existance.
for (String name : OreDictionary.getOreNames()) for (String name : OreDictionary.getOreNames())
{ {
if ( shouldCare( name ) ) if ( name != null && shouldCare( name ) )
{ {
for (ItemStack item : OreDictionary.getOres( name )) for (ItemStack item : OreDictionary.getOres( name ))
{ {
n.oreRegistered( name, item ); if ( item != null )
n.oreRegistered( name, item );
} }
} }
} }