diff options
| author | Tec <daniel112092@gmail.com> | 2021-01-25 20:26:34 +0100 |
|---|---|---|
| committer | Tec <daniel112092@gmail.com> | 2021-01-25 20:26:34 +0100 |
| commit | f648b467f1b723b6df39040119ee11f6b626bda1 (patch) | |
| tree | d9c7cd7fd3824afe61aefca7c3aa27ea91c123ae /src | |
| parent | f1abb31f609b9f2ae89cea9169180fd85da77fa1 (diff) | |
| parent | 2a06e369f32173447139743992fb0317085dbb88 (diff) | |
| download | GT5-Unofficial-f648b467f1b723b6df39040119ee11f6b626bda1.tar.gz GT5-Unofficial-f648b467f1b723b6df39040119ee11f6b626bda1.tar.bz2 GT5-Unofficial-f648b467f1b723b6df39040119ee11f6b626bda1.zip | |
Merge branch 'master' into BassAddons
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index da5ca5500d..465ac9ff71 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -1212,7 +1212,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt stopMachine(); } - if (mMaxProgresstime > 0 && ++mProgresstime >= mMaxProgresstime && RECIPE_AT == Tick) {//progress increase and done + if (mMaxProgresstime > 0 && ++mProgresstime >= mMaxProgresstime) {//progress increase and done hatchesStatusUpdate_EM(); outputAfterRecipe_EM(); @@ -1224,6 +1224,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt mProgresstime = 0; mMaxProgresstime = 0; mEfficiencyIncrease = 0; + if (aBaseMetaTileEntity.isAllowedToWork()) { if (checkRecipe(mInventory[1])) { mEfficiency = Math.max(0, min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]) - (getIdealStatus() - getRepairStatus()) * 1000)); @@ -2590,4 +2591,4 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt return false; } //endregion -}
\ No newline at end of file +} |