From f3ddb433e0f0f4e554638f897e66051a463fdc86 Mon Sep 17 00:00:00 2001
From: miozune <miozune@gmail.com>
Date: Wed, 10 May 2023 17:01:38 +0900
Subject: Fix ME Output Hatch not outputting other fluids if one gets stuck
 (#1971)

---
 .../tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java
index 693903a39a..cc4911425b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java
@@ -178,7 +178,8 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O
     public void gridChanged() {}
 
     private void flushCachedStack() {
-        lastOutputFailed = false;
+        if (fluidCache.isEmpty()) return;
+        lastOutputFailed = true;
         AENetworkProxy proxy = getProxy();
         if (proxy == null) {
             lastOutputFailed = true;
@@ -191,10 +192,10 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O
                 if (s.getStackSize() == 0) continue;
                 IAEFluidStack rest = fluidAEInsert(proxy.getEnergy(), sg, s, getRequest());
                 if (rest != null && rest.getStackSize() > 0) {
-                    lastOutputFailed = true;
                     s.setStackSize(rest.getStackSize());
-                    break;
+                    continue;
                 }
+                lastOutputFailed = false;
                 s.setStackSize(0);
             }
         } catch (final GridAccessException ignored) {
-- 
cgit