summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityRabbit.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-12-06 10:00:00 +1100
committermd_5 <git@md-5.net>2018-12-06 10:00:00 +1100
commitaa36c8417bda9bdd4812c6094895677654cff83d (patch)
treef28adbc34ebef8ef5816c95597927b4c72ba2797 /nms-patches/EntityRabbit.patch
parent20fc5bea2c51de8d5239b68d83e878896b8ff505 (diff)
downloadcraftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.tar
craftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.tar.gz
craftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.tar.lz
craftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.tar.xz
craftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.zip
Mappings Update
Diffstat (limited to 'nms-patches/EntityRabbit.patch')
-rw-r--r--nms-patches/EntityRabbit.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/EntityRabbit.patch b/nms-patches/EntityRabbit.patch
index 91309d3b..131620cc 100644
--- a/nms-patches/EntityRabbit.patch
+++ b/nms-patches/EntityRabbit.patch
@@ -18,7 +18,7 @@
@@ -397,9 +403,23 @@
Integer integer = (Integer) iblockdata.get(BlockCarrots.AGE);
- if (integer.intValue() == 0) {
+ if (integer == 0) {
+ // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.f, blockposition, Blocks.AIR.getBlockData()).isCancelled()) {
+ return;
@@ -31,11 +31,11 @@
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(
+ this.f,
+ blockposition,
-+ iblockdata.set(BlockCarrots.AGE, Integer.valueOf(integer.intValue() - 1))
++ iblockdata.set(BlockCarrots.AGE, integer - 1)
+ ).isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
- world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockCarrots.AGE, Integer.valueOf(integer.intValue() - 1)), 2);
+ world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockCarrots.AGE, integer - 1), 2);
world.triggerEffect(2001, blockposition, Block.getCombinedId(iblockdata));
}