aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity/implementations
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2020-04-17 23:20:02 +0200
committerGitHub <noreply@github.com>2020-04-17 23:20:02 +0200
commitc999a88cbf914244fb70cf17eda0b5f261642451 (patch)
treeea11192e1f660ad373a8e0ad33d8cd98cd4d27e7 /src/main/java/gregtech/api/metatileentity/implementations
parent7be85ea0742de92b2c211ee8bd362e2a3f55c2ed (diff)
parent3287a00923693d0084bb60061c3211da832710fc (diff)
downloadGT5-Unofficial-c999a88cbf914244fb70cf17eda0b5f261642451.tar.gz
GT5-Unofficial-c999a88cbf914244fb70cf17eda0b5f261642451.tar.bz2
GT5-Unofficial-c999a88cbf914244fb70cf17eda0b5f261642451.zip
Merge pull request #266 from GTNewHorizons/experimentalMogballThreading
Tried to make Mogballs Optimisation properly threaded
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java
index 9db9ad910e..7074d63422 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java
@@ -97,4 +97,9 @@ public class GT_MetaPipeEntity_Frame extends MetaPipeEntity {
@Override
public void disconnect(byte aSide) {/* Do nothing*/}
+
+ @Override
+ public boolean isMachineBlockUpdateRecursive() {
+ return true;
+ }
} \ No newline at end of file
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index da80a9e231..3efbe0d57b 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -33,7 +33,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
public static boolean disableMaintenance;
public boolean mMachine = false, mWrench = false, mScrewdriver = false, mSoftHammer = false, mHardHammer = false, mSolderingTool = false, mCrowbar = false, mRunningOnLoad = false;
- public int mPollution = 0, mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mEfficiencyIncrease = 0, mUpdate = 0, mStartUpCheck = 100, mRuntime = 0, mEfficiency = 0;
+ public int mPollution = 0, mProgresstime = 0, mMaxProgresstime = 0, mEUt = 0, mEfficiencyIncrease = 0, mStartUpCheck = 100, mRuntime = 0, mEfficiency = 0;
+ public volatile int mUpdate = 0;
public ItemStack[] mOutputItems = null;
public FluidStack[] mOutputFluids = null;
public String mNEI;