From e48a853b128cfc747e48230d63eee18cc66d80e7 Mon Sep 17 00:00:00 2001
From: Dream-Master <dream-master@gmx.net>
Date: Wed, 14 Jun 2017 22:31:22 +0200
Subject: cherry pick 91fb725a472f8a832e47809d904d51c1ba61985e Fixed a bug
 where an Assembler recipe would be added if the output is null

---
 src/main/java/gregtech/common/GT_RecipeAdder.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/java/gregtech/common')

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) {
-- 
cgit