aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2016-10-21 23:51:48 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2016-10-21 23:51:48 +0200
commit6dd3ab8cced8106ad90f947d36c7ed9e6e378889 (patch)
treecc939db66f7fde0c98540b865ae2703b81d5ac8c /src/main/java
parente3dad9220c1ab677a994aba1dcde2b86d3da7d05 (diff)
downloadGT5-Unofficial-6dd3ab8cced8106ad90f947d36c7ed9e6e378889.tar.gz
GT5-Unofficial-6dd3ab8cced8106ad90f947d36c7ed9e6e378889.tar.bz2
GT5-Unofficial-6dd3ab8cced8106ad90f947d36c7ed9e6e378889.zip
Fix mercury crafting exploit
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
index 879e98687e..4b263a07b0 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java
@@ -22,6 +22,7 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis
GT_RecipeRegistrator.registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false);
if (!aMaterial.contains(SubTag.NO_SMELTING)) {
GT_Values.RA.addAlloySmelterRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), ItemList.Shape_Mold_Nugget.get(0L, new Object[0]), GT_Utility.copyAmount(9L, new Object[]{aStack}), 100, 1);
+ if(aMaterial==Materials.Mercury)return;
if ((GT_ModHandler.getSmeltingOutput(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), false, null) == null) && (GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial.mSmeltInto, 1L) != null) && (!GT_ModHandler.addSmeltingRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), GT_Utility.copyAmount(9L, new Object[]{aStack})))) {
GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(9L, new Object[]{aStack}), new Object[]{aOreDictName});}
}