summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityFallingBlock.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2015-08-01 16:48:20 +1000
committermd_5 <git@md-5.net>2015-09-19 09:27:51 +1000
commit62a216966f980addcd14deb1a9ed0ab146fd3ddf (patch)
tree95b4ba7dfdd32b340add68f0f77044cf7933cd3a /nms-patches/EntityFallingBlock.patch
parenta0d2928ba4b0006a1c43e42ca5f1238f3e5306a9 (diff)
downloadcraftbukkit-62a216966f980addcd14deb1a9ed0ab146fd3ddf.tar
craftbukkit-62a216966f980addcd14deb1a9ed0ab146fd3ddf.tar.gz
craftbukkit-62a216966f980addcd14deb1a9ed0ab146fd3ddf.tar.lz
craftbukkit-62a216966f980addcd14deb1a9ed0ab146fd3ddf.tar.xz
craftbukkit-62a216966f980addcd14deb1a9ed0ab146fd3ddf.zip
SPIGOT-1076: Add HurtEntities API for FallingBlock.
Diffstat (limited to 'nms-patches/EntityFallingBlock.patch')
-rw-r--r--nms-patches/EntityFallingBlock.patch10
1 files changed, 9 insertions, 1 deletions
diff --git a/nms-patches/EntityFallingBlock.patch b/nms-patches/EntityFallingBlock.patch
index fd5a6f12..a0ffb880 100644
--- a/nms-patches/EntityFallingBlock.patch
+++ b/nms-patches/EntityFallingBlock.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/EntityFallingBlock.java
+++ b/net/minecraft/server/EntityFallingBlock.java
-@@ -4,6 +4,8 @@
+@@ -4,13 +4,15 @@
import java.util.ArrayList;
import java.util.Iterator;
@@ -9,6 +9,14 @@
public class EntityFallingBlock extends Entity {
private IBlockData block;
+ public int ticksLived;
+ public boolean dropItem = true;
+ private boolean e;
+- private boolean hurtEntities;
++ public boolean hurtEntities; // PAIL: private -> public
+ private int fallHurtMax = 40;
+ private float fallHurtAmount = 2.0F;
+ public NBTTagCompound tileEntityData;
@@ -56,7 +58,7 @@
if (this.ticksLived++ == 0) {