From ea8ba995ac685388894afa5291a46af1524125ea Mon Sep 17 00:00:00 2001
From: PEMapModder <pemapmodder1970@gmail.com>
Date: Sat, 31 Oct 2015 21:18:06 +0800
Subject: [PATCH] Update Player.php

---
 src/pocketmine/Player.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index ae38135f3..60299e101 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -1856,7 +1856,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
 				}
 
 				if($this->teleportPosition !== null or ($this->forceMovement instanceof Vector3 and (($dist = $newPos->distanceSquared($this->forceMovement)) > 0.1 or $revert))){
-					$this->sendPosition($this->forceMovement, $packet->yaw, $packet->pitch);
+					$this->sendPosition($this->teleportPosition === null ? $this->forceMovement : $this->teleportPosition, $packet->yaw, $packet->pitch);
 				}else{
 					$packet->yaw %= 360;
 					$packet->pitch %= 360;