2015-03-22 17:38:04 +00:00
|
|
|
--- ../src-base/minecraft/net/minecraftforge/oredict/OreDictionary.java
|
|
|
|
|
+++ ../src-work/minecraft/net/minecraftforge/oredict/OreDictionary.java
|
2016-01-05 06:54:34 +00:00
|
|
|
@@ -221,7 +221,7 @@
|
2015-03-22 17:38:04 +00:00
|
|
|
{
|
|
|
|
|
ShapedRecipes recipe = (ShapedRecipes)obj;
|
|
|
|
|
ItemStack output = recipe.getRecipeOutput();
|
|
|
|
|
- if (output != null && containsMatch(false, exclusions, output))
|
|
|
|
|
+ if ((output != null && containsMatch(false, exclusions, output)) || output == null) // Cauldron - fixes NPE's with null recipes being added to forge
|
|
|
|
|
{
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2016-01-05 06:54:34 +00:00
|
|
|
@@ -236,7 +236,7 @@
|
2015-03-22 17:38:04 +00:00
|
|
|
{
|
|
|
|
|
ShapelessRecipes recipe = (ShapelessRecipes)obj;
|
|
|
|
|
ItemStack output = recipe.getRecipeOutput();
|
|
|
|
|
- if (output != null && containsMatch(false, exclusions, output))
|
|
|
|
|
+ if ((output != null && containsMatch(false, exclusions, output)) || output == null) // Cauldron - fixes NPE's with null recipes being added to forge
|
|
|
|
|
{
|
|
|
|
|
continue;
|
|
|
|
|
}
|
