You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
21 lines
1.1 KiB
21 lines
1.1 KiB
10 years ago
|
--- ../src-base/minecraft/net/minecraftforge/oredict/OreDictionary.java
|
||
|
|
+++ ../src-work/minecraft/net/minecraftforge/oredict/OreDictionary.java
|
||
|
|
@@ -216,7 +216,7 @@
|
||
|
|
{
|
||
|
|
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;
|
||
|
|
}
|
||
|
|
@@ -231,7 +231,7 @@
|
||
|
|
{
|
||
|
|
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;
|
||
|
|
}
|