diff options
| author | Tec <daniel112092@gmail.com> | 2021-01-09 15:22:29 +0100 |
|---|---|---|
| committer | Tec <daniel112092@gmail.com> | 2021-01-09 15:22:29 +0100 |
| commit | 733df7fdfa6bbeffc9179543e3bce4897fca1809 (patch) | |
| tree | 6e4019f18483e30cb0fc531a202eb618443b2584 /src/main/java/com | |
| parent | 262f82fb854237f43932ea6fc21ee081c733ea39 (diff) | |
| parent | e4fe2b8644761b5668bc1203727db6b487ee3f04 (diff) | |
| download | GT5-Unofficial-733df7fdfa6bbeffc9179543e3bce4897fca1809.tar.gz GT5-Unofficial-733df7fdfa6bbeffc9179543e3bce4897fca1809.tar.bz2 GT5-Unofficial-733df7fdfa6bbeffc9179543e3bce4897fca1809.zip | |
Merge branch 'BassAddons'
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java | 4 |
1 files changed, 2 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 d059e0e801..63df215bc8 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 @@ -801,13 +801,13 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt eMaxAmpereGen = aNBT.getLong("eGenRating"); maxEUinputMin = aNBT.getLong("eMaxEUmin"); maxEUinputMax = aNBT.getLong("eMaxEUmax"); - eAmpereFlow = aNBT.getLong("eRating"); + eAmpereFlow = aNBT.hasKey("eRating")?aNBT.getLong("eRating"):1; eMaxAmpereFlow = aNBT.getLong("eMaxA"); eRequiredData = aNBT.getLong("eDataR"); eAvailableData = aNBT.getLong("eDataA"); eCertainMode = aNBT.getByte("eCertainM"); eCertainStatus = aNBT.getByte("eCertainS"); - minRepairStatus = aNBT.getByte("eMinRepair"); + minRepairStatus = aNBT.hasKey("eMinRepair")?aNBT.getByte("eMinRepair"):3; extendedFacing=ExtendedFacing.of( ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()), Rotation.byIndex(aNBT.getByte("eRotation")), |