aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Server
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2012-03-17 18:01:56 +0100
committerShauren <shauren.trinity@gmail.com>2012-03-17 18:01:56 +0100
commit01f3620d4534d2bdafadf9a04f09330d406bd019 (patch)
tree23d823c4396eb806ee86f6d2083fd9ee803f6fa7 /src/server/game/Server
parent5d25dc8926dcac65c9981cd865af15aa7d780516 (diff)
Core/Movement: Corrected movement info structure written in WriteMovementInfo
Diffstat (limited to 'src/server/game/Server')
-rwxr-xr-xsrc/server/game/Server/WorldSession.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index eca96f857b2..e6634019c09 100755
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -864,9 +864,9 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo* mi)
situations it may be feasable to use .gm fly on as a GM without having .gm on,
e.g. aerial combat.
*/
-
+
if (mi->HasMovementFlag(MOVEMENTFLAG_FLYING | MOVEMENTFLAG_CAN_FLY) && GetSecurity() == SEC_PLAYER &&
- !GetPlayer()->m_mover->HasAuraType(SPELL_AURA_FLY) &&
+ !GetPlayer()->m_mover->HasAuraType(SPELL_AURA_FLY) &&
!GetPlayer()->m_mover->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED))
VIOLATE_AND_RETURN;
@@ -889,6 +889,9 @@ void WorldSession::WriteMovementInfo(WorldPacket* data, MovementInfo* mi)
*data << mi->t_pos.PositionXYZOStream();
*data << mi->t_time;
*data << mi->t_seat;
+
+ if (mi->HasExtraMovementFlag(MOVEMENTFLAG2_INTERPOLATED_MOVEMENT))
+ *data << mi->t_time2;
}
if (mi->HasMovementFlag(MovementFlags(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING)) || mi->HasExtraMovementFlag(MOVEMENTFLAG2_ALWAYS_ALLOW_PITCHING))