aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2016-10-15 15:42:45 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2016-10-15 15:42:45 +0200
commitf97698b054c1d3ef1544365a65ccd90ba8d3bb6c (patch)
treecc65d5228106669e7f3fd0d1e0aadd9e8b816e21 /src/main
parentf037d652a7c464f5d3be7c020e52ee4edd10d08b (diff)
downloadGT5-Unofficial-f97698b054c1d3ef1544365a65ccd90ba8d3bb6c.tar.gz
GT5-Unofficial-f97698b054c1d3ef1544365a65ccd90ba8d3bb6c.tar.bz2
GT5-Unofficial-f97698b054c1d3ef1544365a65ccd90ba8d3bb6c.zip
Catch crash with Fossils Archeology Revival #642
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index f14d4ad08f..31cf28b250 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -863,6 +863,7 @@ public class GT_Utility {
ItemStack[] tStack = GT_OreDictUnificator.getStackArray(true, aOutput);
if(tStack==null||(tStack.length>0&&GT_Utility.areStacksEqual(aInput, tStack[0])))return false;
if (tOreName != null) {
+ if(tOreName.toString().equals("dustAsh")&&tStack[0].getUnlocalizedName().equals("tile.volcanicAsh"))return false;
aRecipeList.put(new RecipeInputOreDict(tOreName.toString(), aInput.stackSize), new RecipeOutput(aNBT, tStack));
} else {
aRecipeList.put(new RecipeInputItemStack(copy(aInput), aInput.stackSize), new RecipeOutput(aNBT, tStack));