summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2014-12-02 20:39:30 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2014-12-02 20:39:30 +0000
commit37102a0c167c4e1115d5e124840bbbd2cbfe9ec1 (patch)
tree49616739b2f2b59f4736b8496a19eb260a1bc58d /nms-patches
parent2422099346777b0c5ba4cf086d8cac24f9238b97 (diff)
downloadcraftbukkit-37102a0c167c4e1115d5e124840bbbd2cbfe9ec1.tar
craftbukkit-37102a0c167c4e1115d5e124840bbbd2cbfe9ec1.tar.gz
craftbukkit-37102a0c167c4e1115d5e124840bbbd2cbfe9ec1.tar.lz
craftbukkit-37102a0c167c4e1115d5e124840bbbd2cbfe9ec1.tar.xz
craftbukkit-37102a0c167c4e1115d5e124840bbbd2cbfe9ec1.zip
SPIGOT-102: Fix the player being teleported up 1.62 blocks on cancelling the PlayerMoveEvent
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/PlayerConnection.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/PlayerConnection.patch b/nms-patches/PlayerConnection.patch
index cf70c92a..4bf78c5d 100644
--- a/nms-patches/PlayerConnection.patch
+++ b/nms-patches/PlayerConnection.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/PlayerConnection.java 2014-11-30 12:10:17.417157726 +0000
-+++ src/main/java/net/minecraft/server/PlayerConnection.java 2014-11-30 12:10:10.193157886 +0000
+--- ../work/decompile-8eb82bde//net/minecraft/server/PlayerConnection.java 2014-12-02 20:39:19.177600755 +0000
++++ src/main/java/net/minecraft/server/PlayerConnection.java 2014-12-02 20:38:47.001601469 +0000
@@ -16,6 +16,48 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -198,7 +198,7 @@
+
+ // If the event is cancelled we move the player back to their old location.
+ if (event.isCancelled()) {
-+ this.player.playerConnection.sendPacket(new PacketPlayOutPosition(from.getX(), from.getY() + 1.6200000047683716D, from.getZ(), from.getYaw(), from.getPitch(), Collections.emptySet()));
++ this.player.playerConnection.sendPacket(new PacketPlayOutPosition(from.getX(), from.getY(), from.getZ(), from.getYaw(), from.getPitch(), Collections.emptySet()));
+ return;
+ }
+