mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11074] Fix structure of MSG_MOVE_TELEPORT_ACK

Browse source
This commit is contained in:
zergtmn 2011-01-27 00:31:39 +05:00
parent 6fbf464786
commit d30a757e86
3 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/game/Player.cpp
View file

@ -1815,7 +1815,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
if(!GetSession()->PlayerLogout()) if(!GetSession()->PlayerLogout())
{ {
WorldPacket data; WorldPacket data;
BuildTeleportAckMsg(&data, x, y, z, orientation); BuildTeleportAckMsg(data, x, y, z, orientation);
GetSession()->SendPacket(&data); GetSession()->SendPacket(&data);
} }
} }
@ -22422,19 +22422,15 @@ void Player::SendClearCooldown( uint32 spell_id, Unit* target )
SendDirectMessage(&data); SendDirectMessage(&data);
} }
void Player::BuildTeleportAckMsg( WorldPacket *data, float x, float y, float z, float ang ) const void Player::BuildTeleportAckMsg(WorldPacket& data, float x, float y, float z, float ang) const
{ {
data->Initialize(MSG_MOVE_TELEPORT_ACK, 41); MovementInfo mi = m_movementInfo;
*data << GetPackGUID(); mi.ChangePosition(x, y, z, ang);
*data << uint32(0); // this value increments every time
*data << uint32(m_movementInfo.GetMovementFlags()); // movement flags data.Initialize(MSG_MOVE_TELEPORT_ACK, 64);
*data << uint16(0); // 2.3.0 data << GetPackGUID();
*data << uint32(WorldTimer::getMSTime()); // time data << uint32(0); // this value increments every time
*data << x; data << mi;
*data << y;
*data << z;
*data << ang;
*data << uint32(0);
} }
bool Player::HasMovementFlag( MovementFlags f ) const bool Player::HasMovementFlag( MovementFlags f ) const

2
src/game/Player.h
View file

@ -2230,7 +2230,7 @@ class MANGOS_DLL_SPEC Player : public Unit
} }
void HandleFall(MovementInfo const& movementInfo); void HandleFall(MovementInfo const& movementInfo);
void BuildTeleportAckMsg( WorldPacket *data, float x, float y, float z, float ang) const; void BuildTeleportAckMsg(WorldPacket& data, float x, float y, float z, float ang) const;
bool isMoving() const { return m_movementInfo.HasMovementFlag(movementFlagsMask); } bool isMoving() const { return m_movementInfo.HasMovementFlag(movementFlagsMask); }
bool isMovingOrTurning() const { return m_movementInfo.HasMovementFlag(movementOrTurningFlagsMask); } bool isMovingOrTurning() const { return m_movementInfo.HasMovementFlag(movementOrTurningFlagsMask); }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11073" #define REVISION_NR "11074"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__