From e2d5c0d3fb74be92eb0435bb5ac9dabc9b85c8cd Mon Sep 17 00:00:00 2001 From: megamage Date: Sun, 14 Jun 2009 21:02:52 -0500 Subject: *Fix a bug that flying puppet interrupts caster's channelling. --HG-- branch : trunk --- src/game/MiscHandler.cpp | 2 +- src/game/MovementHandler.cpp | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index 043397f9c48..f5a1013f085 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -1609,7 +1609,7 @@ void WorldSession::HandleMoveSetCanFlyAckOpcode( WorldPacket & recv_data ) recv_data >> guid >> unk >> flags; - _player->m_movementInfo.flags = flags; + _player->m_mover->m_movementInfo.flags = flags; } void WorldSession::HandleRequestPetInfoOpcode( WorldPacket & /*recv_data */) 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(); } -- cgit v1.2.3