diff options
author | Dream-Master <dream-master@gmx.net> | 2017-06-14 22:31:22 +0200 |
---|---|---|
committer | Dream-Master <dream-master@gmx.net> | 2017-06-14 22:31:22 +0200 |
commit | e48a853b128cfc747e48230d63eee18cc66d80e7 (patch) | |
tree | a2ab060b77e3b3c4678d17669f87fc4cd40f4e9d /src/main | |
parent | 9f83554d88922a352a563229c18585817ebde5c2 (diff) | |
download | GT5-Unofficial-e48a853b128cfc747e48230d63eee18cc66d80e7.tar.gz GT5-Unofficial-e48a853b128cfc747e48230d63eee18cc66d80e7.tar.bz2 GT5-Unofficial-e48a853b128cfc747e48230d63eee18cc66d80e7.zip |
cherry pick
91fb725a472f8a832e47809d904d51c1ba61985e
Fixed a bug where an Assembler recipe would be added if the output is
null
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/gregtech/common/GT_RecipeAdder.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 21af0b347a..69c04e83f4 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -282,7 +282,10 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { } public boolean addAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt) { - if (areItemsAndFluidsBothNull(aInputs, null)) { + if (areItemsAndFluidsBothNull(aInputs, new FluidStack[]{aFluidInput})) { + return false; + } + if (aOutput1 == null) { return false; } if ((aDuration = GregTech_API.sRecipeFile.get("assembling", aOutput1, aDuration)) <= 0) { |