aboutsummaryrefslogtreecommitdiff
path: root/src/game/MovementHandler.cpp
diff options
context:
space:
mode:
authorn0n4m3 <none@none>2010-01-13 19:11:46 +0300
committern0n4m3 <none@none>2010-01-13 19:11:46 +0300
commitf7ad3aefc8e63e87c29d5e9c169210f4e7e80ac8 (patch)
tree7418fd8e76d498bb754b3b92b981743e20199f98 /src/game/MovementHandler.cpp
parentedeb6bf284e9f7ab501f6c3273221dbf02d60084 (diff)
Removed all my commits for today, this is hack? really? okey
--HG-- branch : trunk
Diffstat (limited to 'src/game/MovementHandler.cpp')
-rw-r--r--src/game/MovementHandler.cpp26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
index d4388f3c7a4..da0387f8d1b 100644
--- a/src/game/MovementHandler.cpp
+++ b/src/game/MovementHandler.cpp
@@ -488,18 +488,20 @@ void WorldSession::HandleSetActiveMoverOpcode(WorldPacket &recv_data)
uint64 guid;
recv_data >> guid;
- if(GetPlayer()->IsInWorld())
- if(Unit *mover = ObjectAccessor::GetUnit(*GetPlayer(), guid))
- {
- GetPlayer()->SetMover(mover);
- if(mover != GetPlayer() && mover->canFly())
- {
- WorldPacket data(SMSG_MOVE_SET_CAN_FLY, 12);
- data.append(mover->GetPackGUID());
- data << uint32(0);
- SendPacket(&data);
- }
- }
+ if(guid == GetPlayer()->m_mover->GetGUID())
+ return;
+
+ if(Unit *mover = ObjectAccessor::GetUnit(*GetPlayer(), guid))
+ {
+ GetPlayer()->SetMover(mover);
+ if(mover != GetPlayer() && mover->canFly())
+ {
+ WorldPacket data(SMSG_MOVE_SET_CAN_FLY, 12);
+ data.append(mover->GetPackGUID());
+ data << uint32(0);
+ SendPacket(&data);
+ }
+ }
else
{
sLog.outError("HandleSetActiveMoverOpcode: incorrect mover guid: mover is " UI64FMTD " and should be " UI64FMTD, guid, _player->m_mover->GetGUID());