diff options
| author | Prometheus0000 <prometheus0000000@gmail.com> | 2021-02-11 14:29:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 14:29:19 -0500 |
| commit | 3a027e939e2c18e165b2f1405637c92f25736582 (patch) | |
| tree | 1d75209cd6c074313f0e3f15bc989f7b258a57bd /src/main/java/gregtech/common/blocks/GT_Block_Concretes.java | |
| parent | c6324633a4491296c0505e59aa7f8747af0c640a (diff) | |
| parent | e0c1f654b17d901d018603912bf32c32bd136bad (diff) | |
| download | GT5-Unofficial-3a027e939e2c18e165b2f1405637c92f25736582.tar.gz GT5-Unofficial-3a027e939e2c18e165b2f1405637c92f25736582.tar.bz2 GT5-Unofficial-3a027e939e2c18e165b2f1405637c92f25736582.zip | |
Merge pull request #23 from GTNewHorizons/experimental
update
Diffstat (limited to 'src/main/java/gregtech/common/blocks/GT_Block_Concretes.java')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Concretes.java | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Concretes.java b/src/main/java/gregtech/common/blocks/GT_Block_Concretes.java index 0c24227ad3..2641b9db44 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Concretes.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Concretes.java @@ -72,29 +72,4 @@ public class GT_Block_Concretes extends GT_Block_Stones_Abstract implements IBlo aEntity.motionX *= tSpeed; aEntity.motionZ *= tSpeed; } } - - /** - public void onEntityCollidedWithBlock(World aWorld, int aX, int aY, int aZ, Entity aEntity) { - Block tBlock = aWorld.getBlock(aX, aY + 1, aZ); - if (((aEntity instanceof EntityLivingBase)) && (!(tBlock instanceof IFluidBlock)) && (!(tBlock instanceof BlockLiquid)) && (aEntity.onGround) && (!aEntity.isInWater()) && (!aEntity.isWet())) { - if (aEntity.isSneaking()) { - aEntity.motionX *= 0.8999999761581421D; - aEntity.motionZ *= 0.8999999761581421D; - } else { - if (aEntity.motionX < 6.0 && aEntity.motionZ < 6.0) { - aEntity.motionX *= 1.100000023841858D; - aEntity.motionZ *= 1.100000023841858D; - } - } - } - } - - public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) { - Block tBlock = aWorld.getBlock(aX, aY + 1, aZ); - if (((tBlock instanceof IFluidBlock)) || ((tBlock instanceof BlockLiquid))) { - return super.getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ); - } - return AxisAlignedBB.getBoundingBox(aX, aY, aZ, aX + 1, aY + 0.875D, aZ + 1); - } - **/ } |
