From 1d60be1d549c7dfd0801d10d3d3d00854b256f2d Mon Sep 17 00:00:00 2001
From: HoleFish <48403212+HoleFish@users.noreply.github.com>
Date: Tue, 5 Nov 2024 02:46:19 +0800
Subject: Fix wrong shutdown duration of tectech multi & cleanup (#3424)

---
 .../thing/metaTileEntity/multi/base/TTMultiblockBase.java        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/main/java/tectech/thing')

diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java
index 5020533663..5a4bc93910 100644
--- a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java
+++ b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java
@@ -851,7 +851,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT
         for (MTEHatchDataOutput data : eOutputData) {
             data.q = null;
         }
-
+        mLastWorkingTick = mTotalRunTime;
         mOutputItems = null;
         mOutputFluids = null;
         mEfficiency = 0;
@@ -1113,6 +1113,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT
                                     mProgresstime = 0;
                                     mMaxProgresstime = 0;
                                     mEfficiencyIncrease = 0;
+                                    mLastWorkingTick = mTotalRunTime;
 
                                     if (aBaseMetaTileEntity.isAllowedToWork()) {
                                         if (checkRecipe()) {
@@ -1148,10 +1149,10 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT
                                 updateSlots();
                             } // else notAllowedToWork_stopMachine_EM(); //it is already stopped here
                         }
-                    } else { // not repaired
+                    } else if (aBaseMetaTileEntity.isAllowedToWork()) { // not repaired
                         stopMachine(ShutDownReasonRegistry.NO_REPAIR);
                     }
-                } else { // not complete
+                } else if (aBaseMetaTileEntity.isAllowedToWork()) { // not complete
                     stopMachine(ShutDownReasonRegistry.STRUCTURE_INCOMPLETE);
                 }
             }
@@ -1461,7 +1462,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT
                 getPowerFlow(),
                 getPowerFlow() * getMaxEfficiency(aStack) / Math.max(1000L, mEfficiency),
                 eAmpereFlow)) {
-                criticalStopMachine();
+                stopMachine(ShutDownReasonRegistry.POWER_LOSS);
                 return false;
             }
         }
-- 
cgit