*merge

--HG--
branch : trunk

1 files changed, 2 insertions, 7 deletions

diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
index 775cef0edca..c3c82d552ac 100644
--- a/src/game/MovementHandler.cpp
+++ b/src/game/MovementHandler.cpp
@@ -293,7 +293,6 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
     GetPlayer()->SendMessageToSet(&data, false);
 
     mover->m_movementInfo = movementInfo;
-    mover->SetUnitMovementFlags(movementInfo.flags);
 
     if(plMover)                                             // nothing is charmed, or player charmed
     {
@@ -462,9 +461,7 @@ void WorldSession::HandleMoveNotActiveMover(WorldPacket &recv_data)
         return;
     }*/
 
-    MovementInfo mi;
-    ReadMovementInfo(recv_data, &mi);
-    _player->m_movementInfo = mi;
+    ReadMovementInfo(recv_data, &_player->m_mover->m_movementInfo);
 }
 
 void WorldSession::HandleDismissControlledVehicle(WorldPacket &recv_data)
@@ -477,9 +474,7 @@ void WorldSession::HandleDismissControlledVehicle(WorldPacket &recv_data)
     if(!vehicleGUID)                                        // something wrong here...
         return;
 
-    MovementInfo mi;
-    ReadMovementInfo(recv_data, &mi);
-    _player->m_movementInfo = mi;
+    ReadMovementInfo(recv_data, &_player->m_mover->m_movementInfo);
     _player->ExitVehicle();
 }