summaryrefslogtreecommitdiffstats
path: root/nms-patches/PlayerConnection.patch
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2016-03-06 22:17:32 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2016-03-06 22:17:32 +0000
commita06e5cf8e82240893db66171331da647a3252c53 (patch)
treee3896bf06863df41f96f8b40986c03b994529827 /nms-patches/PlayerConnection.patch
parent8ad0cd08950c8fc99cd89d825ae8f38e9f6df1cf (diff)
downloadcraftbukkit-a06e5cf8e82240893db66171331da647a3252c53.tar
craftbukkit-a06e5cf8e82240893db66171331da647a3252c53.tar.gz
craftbukkit-a06e5cf8e82240893db66171331da647a3252c53.tar.lz
craftbukkit-a06e5cf8e82240893db66171331da647a3252c53.tar.xz
craftbukkit-a06e5cf8e82240893db66171331da647a3252c53.zip
SPIGOT-1788: Correctly teleport the player back to their old location
Diffstat (limited to 'nms-patches/PlayerConnection.patch')
-rw-r--r--nms-patches/PlayerConnection.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/nms-patches/PlayerConnection.patch b/nms-patches/PlayerConnection.patch
index ab11fcbb..b5b451b2 100644
--- a/nms-patches/PlayerConnection.patch
+++ b/nms-patches/PlayerConnection.patch
@@ -247,7 +247,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(), from.getZ(), from.getYaw(), from.getPitch(), Collections.<PacketPlayOutPosition.EnumPlayerTeleportFlags>emptySet(), this.teleportAwait));
++ teleport(from);
+ return;
+ }
+
@@ -375,7 +375,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(), from.getZ(), from.getYaw(), from.getPitch(), Collections.<PacketPlayOutPosition.EnumPlayerTeleportFlags>emptySet(), this.teleportAwait));
++ teleport(from);
+ return;
+ }
+