aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorJohannes Gäßler <updrn@student.kit.edu>2017-06-14 22:24:31 +0200
committerJohannes Gäßler <updrn@student.kit.edu>2017-06-14 22:24:31 +0200
commit91fb725a472f8a832e47809d904d51c1ba61985e (patch)
treefeb53161496df13427c55550c86219b0242f393e /src/main
parent74c41614a5e8a6cb49e62a225669a1e1d07bc87b (diff)
downloadGT5-Unofficial-91fb725a472f8a832e47809d904d51c1ba61985e.tar.gz
GT5-Unofficial-91fb725a472f8a832e47809d904d51c1ba61985e.tar.bz2
GT5-Unofficial-91fb725a472f8a832e47809d904d51c1ba61985e.zip
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.java5
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 9e1316b9cb..189cfe9d53 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -259,7 +259,10 @@ public class GT_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) {