From 0c02816dea626baa2e7a8df1b8a842db943abb4f Mon Sep 17 00:00:00 2001
From: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com>
Date: Thu, 22 Dec 2022 00:05:36 +0200
Subject: fixed it (#1577)

---
 .../GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java              | 6 ++++++
 .../tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java    | 6 +++++-
 .../tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java   | 6 ++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java
index 56bc92e851..79d885db52 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java
@@ -161,4 +161,10 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<
     public long getMaxInputAmps() {
         return GT_ExoticEnergyInputHelper.getMaxInputAmpsMulti(getExoticAndNormalEnergyHatchList());
     }
+
+    @Override
+    public void clearHatches() {
+        super.clearHatches();
+        mExoticEnergyHatches.clear();
+    }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java
index d5871c633b..ecd25b306f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java
@@ -323,7 +323,11 @@ public class GT_MetaTileEntity_NanoForge
             return false;
         }
 
-        return mSpecialTier > 0 && checkExoticAndNormalEnergyHatches();
+        if (!checkExoticAndNormalEnergyHatches()) {
+            return false;
+        }
+
+        return mSpecialTier > 0;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java
index b69ecc2cc8..4cfbe27d62 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java
@@ -414,8 +414,10 @@ public class GT_MetaTileEntity_PCBFactory
             if (!checkPiece(tier1, 3, 5, 0)) {
                 return false;
             }
-
-            if (mSetTier == 2 && checkPiece(tier2, 7, 6, 2)) {
+            if (mSetTier == 2) {
+                if (!checkPiece(tier2, 7, 6, 2)) {
+                    return false;
+                }
                 mTier = 2;
             } else {
                 mTier = 1;
-- 
cgit