From b16f7e4dd545358f5afef516a299070b5efd05b2 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sun, 21 Aug 2016 15:10:46 +0100
Subject: [PATCH] Fix a really annoying movement bug on player join

---
 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 2b0cd3a652..260263e6c6 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -1885,8 +1885,8 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
 
 					$this->setRotation($packet->yaw, $packet->pitch);
 					$this->newPosition = $newPos;
-					$this->forceMovement = null;
 				}
+				$this->forceMovement = null;
 
 				break;
 			case ProtocolInfo::MOB_EQUIPMENT_PACKET: