aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorHoleFish <48403212+HoleFish@users.noreply.github.com>2024-11-05 02:46:19 +0800
committerGitHub <noreply@github.com>2024-11-04 18:46:19 +0000
commit1d60be1d549c7dfd0801d10d3d3d00854b256f2d (patch)
treefc0491f9ab4bc3151ad5fd2e5e1420aa62266f03 /src/main/java/gregtech
parent1ed8c30ca975cb114218929eb0655d2fd48b3085 (diff)
downloadGT5-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/gregtech')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java
index a576295f07..512552e9f0 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java
@@ -54,7 +54,7 @@ public abstract class MTEEnhancedMultiBlockBase<T extends MTEEnhancedMultiBlockB
@Override
public void setExtendedFacing(ExtendedFacing newExtendedFacing) {
if (mExtendedFacing != newExtendedFacing) {
- if (mMachine) stopMachine(ShutDownReasonRegistry.STRUCTURE_INCOMPLETE);
+ if (mMachine && isAllowedToWork()) stopMachine(ShutDownReasonRegistry.STRUCTURE_INCOMPLETE);
mExtendedFacing = newExtendedFacing;
final IGregTechTileEntity base = getBaseMetaTileEntity();
mMachine = false;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer.java
index ea9036577a..66f78a09db 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEFusionComputer.java
@@ -422,6 +422,7 @@ public abstract class MTEFusionComputer extends MTEEnhancedMultiBlockBase<MTEFus
mProgresstime = 0;
mMaxProgresstime = 0;
mEfficiencyIncrease = 0;
+ mLastWorkingTick = mTotalRunTime;
if (mOutputFluids != null && mOutputFluids.length > 0) {
try {
GTMod.achievements.issueAchivementHatchFluid(