Merge branch 'patch-14' of https://github.com/PEMapModder/PocketMine-MP into PEMapModder-patch-14

This commit is contained in:
Intyre 2015-12-20 00:37:07 +01:00
commit 15d6bf663d
No known key found for this signature in database
GPG Key ID: B06D41D26935005A

View File

@ -1879,7 +1879,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;