summaryrefslogtreecommitdiffstats
path: root/nms-patches/ItemChorusFruit.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-03-06 09:57:59 +1100
committermd_5 <git@md-5.net>2016-03-06 09:57:59 +1100
commit9e8c3772871f19b2ee017f25e8b8b02f45a895de (patch)
tree909cbc072be9a87a506ef36ae36d4ac4c310a586 /nms-patches/ItemChorusFruit.patch
parentd6a61e3e5d9959f8f1dd980fb42043a282b5f26a (diff)
downloadcraftbukkit-9e8c3772871f19b2ee017f25e8b8b02f45a895de.tar
craftbukkit-9e8c3772871f19b2ee017f25e8b8b02f45a895de.tar.gz
craftbukkit-9e8c3772871f19b2ee017f25e8b8b02f45a895de.tar.lz
craftbukkit-9e8c3772871f19b2ee017f25e8b8b02f45a895de.tar.xz
craftbukkit-9e8c3772871f19b2ee017f25e8b8b02f45a895de.zip
Update chorus fruit tele event destination.
Diffstat (limited to 'nms-patches/ItemChorusFruit.patch')
-rw-r--r--nms-patches/ItemChorusFruit.patch8
1 files changed, 6 insertions, 2 deletions
diff --git a/nms-patches/ItemChorusFruit.patch b/nms-patches/ItemChorusFruit.patch
index d2606afd..77739fe1 100644
--- a/nms-patches/ItemChorusFruit.patch
+++ b/nms-patches/ItemChorusFruit.patch
@@ -12,7 +12,7 @@
public class ItemChorusFruit extends ItemFood {
public ItemChorusFruit(int i, float f) {
-@@ -19,6 +25,17 @@
+@@ -19,7 +25,21 @@
double d4 = MathHelper.a(entityliving.locY + (double) (entityliving.getRandom().nextInt(16) - 8), 0.0D, (double) (world.Z() - 1));
double d5 = entityliving.locZ + (entityliving.getRandom().nextDouble() - 0.5D) * 16.0D;
@@ -24,9 +24,13 @@
+ if (teleEvent.isCancelled()) {
+ break;
+ }
++ d3 = teleEvent.getTo().getX();
++ d4 = teleEvent.getTo().getY();
++ d5 = teleEvent.getTo().getZ();
+ }
-+ // CraftBukkit end
+
if (entityliving.k(d3, d4, d5)) {
++ // CraftBukkit end
world.a((EntityHuman) null, d0, d1, d2, SoundEffects.af, SoundCategory.PLAYERS, 1.0F, 1.0F);
entityliving.a(SoundEffects.af, 1.0F, 1.0F);
+ break;