From a06e5cf8e82240893db66171331da647a3252c53 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sun, 6 Mar 2016 22:17:32 +0000
Subject: [PATCH] SPIGOT-1788: Correctly teleport the player back to their old
 location

---
 nms-patches/PlayerConnection.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nms-patches/PlayerConnection.patch b/nms-patches/PlayerConnection.patch
index ab11fcbbbf..b5b451b225 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;
 +                                }
 +