diff options
| author | HoleFish <48403212+HoleFish@users.noreply.github.com> | 2024-11-05 02:46:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-04 18:46:19 +0000 |
| commit | 1d60be1d549c7dfd0801d10d3d3d00854b256f2d (patch) | |
| tree | fc0491f9ab4bc3151ad5fd2e5e1420aa62266f03 /src/main/java/tectech/thing | |
| parent | 1ed8c30ca975cb114218929eb0655d2fd48b3085 (diff) | |
| download | GT5-Unofficial-1d60be1d549c7dfd0801d10d3d3d00854b256f2d.tar.gz GT5-Unofficial-1d60be1d549c7dfd0801d10d3d3d00854b256f2d.tar.bz2 GT5-Unofficial-1d60be1d549c7dfd0801d10d3d3d00854b256f2d.zip | |
Fix wrong shutdown duration of tectech multi & cleanup (#3424)
Diffstat (limited to 'src/main/java/tectech/thing')
| -rw-r--r-- | src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java | 9 |
1 files changed, 5 insertions, 4 deletions
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; } } |