Gracefully reject ItemStacks with null items. Avoids crashing if a br…

…oken mod is installed.
gigaherz · Jul 30, 2016 · 2ad05fd · 2ad05fd
1 parent 7ae7441
commit 2ad05fd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,7 @@ repositories {
 
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "1.6.3"
+version = "1.6.4"
 group= "gigaherz.survivalist" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "Survivalist-1.10.2"
 

diff --git a/src/main/java/gigaherz/survivalist/Survivalist.java b/src/main/java/gigaherz/survivalist/Survivalist.java
@@ -257,16 +257,6 @@ private void registerNetwork()
         logger.debug("Final message number: " + messageNumber);
     }
 
-    public static boolean hasOreName(ItemStack stack, String oreName)
-    {
-        int id = OreDictionary.getOreID(oreName);
-        for (int i : OreDictionary.getOreIDs(stack))
-        {
-            if (i == id) return true;
-        }
-        return false;
-    }
-
     @Mod.EventHandler
     public void init(FMLInitializationEvent event)
     {
@@ -560,6 +550,22 @@ else if (oreInput != null)
         }
     }
 
+    public static boolean hasOreName(ItemStack stack, String oreName)
+    {
+        if (stack.getItem() == null)
+        {
+            logger.warn("Detected ItemStack with null item inside!");
+            return false;
+        }
+
+        int id = OreDictionary.getOreID(oreName);
+        for (int i : OreDictionary.getOreIDs(stack))
+        {
+            if (i == id) return true;
+        }
+        return false;
+    }
+
     private void addIngotToNuggets(String oreIngot, String oreNugget)
     {
         List<ItemStack> matches1 = OreDictionary.getOres(oreIngot);