summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
author0x277F <0x277F@gmail.com>2016-03-14 20:15:54 -0600
committermd_5 <git@md-5.net>2016-03-15 15:02:11 +1100
commitfeb2fd5e4363f08dd66afbf0936ae61d3f1d4903 (patch)
tree6b6fe91fddabfc5341407992165e1967072c86e6 /nms-patches
parente43b2780a5d627a844ee19e8adc937bf6ddd40d0 (diff)
downloadcraftbukkit-feb2fd5e4363f08dd66afbf0936ae61d3f1d4903.tar
craftbukkit-feb2fd5e4363f08dd66afbf0936ae61d3f1d4903.tar.gz
craftbukkit-feb2fd5e4363f08dd66afbf0936ae61d3f1d4903.tar.lz
craftbukkit-feb2fd5e4363f08dd66afbf0936ae61d3f1d4903.tar.xz
craftbukkit-feb2fd5e4363f08dd66afbf0936ae61d3f1d4903.zip
SPIGOT-1930: Fix spam for EntityToggleGlideEvent
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/EntityHuman.patch2
-rw-r--r--nms-patches/EntityLiving.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/nms-patches/EntityHuman.patch b/nms-patches/EntityHuman.patch
index 38a51c8d..bcd23a16 100644
--- a/nms-patches/EntityHuman.patch
+++ b/nms-patches/EntityHuman.patch
@@ -382,7 +382,7 @@
this.motY = d3 * 0.6D;
this.aQ = f2;
this.fallDistance = 0.0F;
-+ if (!CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
++ if (!getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
this.setFlag(7, false);
} else {
super.g(f, f1);
diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch
index 6ab6a64c..64f3eaed 100644
--- a/nms-patches/EntityLiving.patch
+++ b/nms-patches/EntityLiving.patch
@@ -506,7 +506,7 @@
}
if (!this.world.isClientSide) {
-+ if (!CraftEventFactory.callToggleGlideEvent(this, flag).isCancelled()) // CraftBukkit
++ if (flag != this.getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, flag).isCancelled()) // CraftBukkit
this.setFlag(7, flag);
}