summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityFallingBlock.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-03-22 18:04:02 +1100
committermd_5 <git@md-5.net>2016-03-22 18:04:02 +1100
commit616a9687a101689f8ad577446cf9caf80ee8ecd4 (patch)
tree10f8cbef102b4f7d5c1022f2c782088b948fd21c /nms-patches/EntityFallingBlock.patch
parentd4e50bef9d5a2b3258e36162280d3d228048b98c (diff)
downloadcraftbukkit-616a9687a101689f8ad577446cf9caf80ee8ecd4.tar
craftbukkit-616a9687a101689f8ad577446cf9caf80ee8ecd4.tar.gz
craftbukkit-616a9687a101689f8ad577446cf9caf80ee8ecd4.tar.lz
craftbukkit-616a9687a101689f8ad577446cf9caf80ee8ecd4.tar.xz
craftbukkit-616a9687a101689f8ad577446cf9caf80ee8ecd4.zip
SPIGOT-1975: Fix falling blocks when height > 1
Diffstat (limited to 'nms-patches/EntityFallingBlock.patch')
-rw-r--r--nms-patches/EntityFallingBlock.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/nms-patches/EntityFallingBlock.patch b/nms-patches/EntityFallingBlock.patch
index 22aa5d3a..54afb180 100644
--- a/nms-patches/EntityFallingBlock.patch
+++ b/nms-patches/EntityFallingBlock.patch
@@ -18,6 +18,15 @@
this.world.setAir(blockposition);
} else if (!this.world.isClientSide) {
this.die();
+@@ -84,7 +86,7 @@
+
+ if (BlockFalling.i(this.world.getType(new BlockPosition(this.locX, this.locY - 0.009999999776482582D, this.locZ)))) {
+ this.onGround = false;
+- return;
++ // return; // CraftBukkit
+ }
+
+ this.motX *= 0.699999988079071D;
@@ -93,7 +95,13 @@
if (iblockdata.getBlock() != Blocks.PISTON_EXTENSION) {
this.die();