diff options
| author | Unknown <tudurap.com@gmail.com> | 2019-07-17 21:55:09 +0200 |
|---|---|---|
| committer | Unknown <tudurap.com@gmail.com> | 2019-07-17 21:55:09 +0200 |
| commit | 29fc6e39ded593e8d481c297a538fc9afee93465 (patch) | |
| tree | e3b22e94171dab532fabc3ce826dbc513596606e /src/main/java | |
| parent | 4ffebee4b90f56624e1bed150ae6e12b96bd4e14 (diff) | |
| parent | 082fa82c0a7a58f2cef95d5bd2c00920c8ee17e2 (diff) | |
| download | GT5-Unofficial-29fc6e39ded593e8d481c297a538fc9afee93465.tar.gz GT5-Unofficial-29fc6e39ded593e8d481c297a538fc9afee93465.tar.bz2 GT5-Unofficial-29fc6e39ded593e8d481c297a538fc9afee93465.zip | |
Merge remote-tracking branch 'origin/ActuallyBetterParametrizers' into BassAddons
Diffstat (limited to 'src/main/java')
2 files changed, 3 insertions, 12 deletions
diff --git a/src/main/java/com/github/technus/tectech/entity/fx/WeightlessParticleFX.java b/src/main/java/com/github/technus/tectech/entity/fx/WeightlessParticleFX.java index 22b72463f8..f4afa098d9 100644 --- a/src/main/java/com/github/technus/tectech/entity/fx/WeightlessParticleFX.java +++ b/src/main/java/com/github/technus/tectech/entity/fx/WeightlessParticleFX.java @@ -8,8 +8,6 @@ import net.minecraft.world.World; @SideOnly(Side.CLIENT) public class WeightlessParticleFX extends EntityFX { - private static final String __OBFID = "CL_00000903"; - public WeightlessParticleFX(World p_i1205_1_, double p_i1205_2_, double p_i1205_4_, double p_i1205_6_, double p_i1205_8_, double p_i1205_10_, double p_i1205_12_) { super(p_i1205_1_, p_i1205_2_, p_i1205_4_, p_i1205_6_, p_i1205_8_, p_i1205_10_, p_i1205_12_); @@ -41,11 +39,5 @@ public class WeightlessParticleFX extends EntityFX this.motionX *= 0.8999999761581421D; this.motionY *= 0.8999999761581421D; this.motionZ *= 0.8999999761581421D; - - if (this.onGround) - { - this.motionX *= 0.699999988079071D; - this.motionZ *= 0.699999988079071D; - } } } 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 635107ff28..71138bb55a 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 @@ -1424,9 +1424,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt eMaxAmpereGen += hatch.maxEUOutput() / maxEUoutputMin * hatch.Amperes; } } - if (getEUVar() > maxEUStore()) { - setEUVar(maxEUStore()); - } } else { maxEUinputMin = 0; maxEUinputMax = 0; @@ -1434,7 +1431,9 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt maxEUoutputMin = 0; maxEUoutputMax = 0; eMaxAmpereGen = 0; - setEUVar(0); + } + if (getEUVar() > maxEUStore()) { + setEUVar(maxEUStore()); } for (GT_MetaTileEntity_Hatch_Uncertainty hatch : eUncertainHatches) { |