From 5781119c4bbd486abb3652c5ceacaf38a76a6bd1 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 1 Nov 2014 00:24:10 +0100 Subject: [PATCH] Core/Entities: Fixed data sent in movement packets - time3 in transport block is actually the id of a vehicle we are passenger on --- src/server/game/Entities/Object/Object.cpp | 18 ++-- src/server/game/Entities/Object/Object.h | 4 +- src/server/game/Entities/Player/Player.cpp | 10 +- src/server/game/Entities/Unit/Unit.cpp | 10 +- src/server/game/Entities/Vehicle/Vehicle.cpp | 1 + .../game/Movement/MovementStructures.cpp | 102 +++++++++--------- src/server/game/Movement/MovementStructures.h | 2 +- 7 files changed, 74 insertions(+), 73 deletions(-) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 38ad803d177..2174e9e8bae 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -339,7 +339,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const uint16 movementFlagsExtra = 0; bool hasTransportTime2 = false; - bool hasTransportTime3 = false; + bool hasVehicleId = false; bool hasFallDirection = false; bool hasFallData = false; bool hasPitch = false; @@ -376,7 +376,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const hasSpline = self->IsSplineEnabled(); hasTransportTime2 = self->m_movementInfo.transport.guid != 0 && self->m_movementInfo.transport.time2 != 0; - hasTransportTime3 = false; + hasVehicleId = false; hasPitch = self->HasUnitMovementFlag(MovementFlags(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING)) || self->HasExtraUnitMovementFlag(MOVEMENTFLAG2_ALWAYS_ALLOW_PITCHING); hasFallDirection = self->HasUnitMovementFlag(MOVEMENTFLAG_FALLING); hasFallData = hasFallDirection || self->m_movementInfo.jump.fallTime != 0; @@ -411,7 +411,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const data->WriteBit(transGuid[4]); data->WriteBit(transGuid[0]); data->WriteBit(transGuid[6]); - data->WriteBit(hasTransportTime3); // Has transport time 3 + data->WriteBit(hasVehicleId); // Has transport time 3 data->WriteBit(transGuid[7]); data->WriteBit(transGuid[5]); data->WriteBit(transGuid[3]); @@ -523,8 +523,8 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const data->WriteByteSeq(transGuid[3]); *data << float(self->GetTransOffsetZ()); data->WriteByteSeq(transGuid[0]); - if (hasTransportTime3) - *data << uint32(self->m_movementInfo.transport.time3); + if (hasVehicleId) + *data << uint32(self->m_movementInfo.transport.vehicleId); *data << int8(self->GetTransSeat()); data->WriteByteSeq(transGuid[1]); @@ -573,8 +573,8 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const data->WriteBit(transGuid[0]); data->WriteBit(transGuid[5]); - if (hasTransportTime3) - *data << uint32(self->m_movementInfo.transport.time3); + if (hasVehicleId) + *data << uint32(self->m_movementInfo.transport.vehicleId); data->WriteBit(transGuid[3]); *data << float(self->GetTransOffsetX()); @@ -1265,8 +1265,8 @@ void MovementInfo::OutDebug() TC_LOG_INFO("misc", "time: %u", transport.time); if (flags2 & MOVEMENTFLAG2_INTERPOLATED_MOVEMENT) TC_LOG_INFO("misc", "time2: %u", transport.time2); - if (transport.time3) - TC_LOG_INFO("misc", "time3: %u", transport.time3); + if (transport.vehicleId) + TC_LOG_INFO("misc", "vehicleId: %u", transport.vehicleId); } if ((flags & (MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING)) || (flags2 & MOVEMENTFLAG2_ALWAYS_ALLOW_PITCHING)) diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index b8410ec307c..bf3231db575 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -401,7 +401,7 @@ struct MovementInfo seat = -1; time = 0; time2 = 0; - time3 = 0; + vehicleId = 0; } ObjectGuid guid; @@ -409,7 +409,7 @@ struct MovementInfo int8 seat; uint32 time; uint32 time2; - uint32 time3; + uint32 vehicleId; } transport; // swimming/flying diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 86400232a9d..c5d323f5e37 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -27700,7 +27700,7 @@ void Player::ReadMovementInfo(WorldPacket& data, MovementInfo* mi, Movement::Ext bool hasOrientation = false; bool hasTransportData = false; bool hasTransportTime2 = false; - bool hasTransportTime3 = false; + bool hasTransportVehicleId = false; bool hasPitch = false; bool hasFallData = false; bool hasFallDirection = false; @@ -27778,7 +27778,7 @@ void Player::ReadMovementInfo(WorldPacket& data, MovementInfo* mi, Movement::Ext break; case MSEHasTransportTime3: if (hasTransportData) - hasTransportTime3 = data.ReadBit(); + hasTransportVehicleId = data.ReadBit(); break; case MSEHasPitch: hasPitch = !data.ReadBit(); @@ -27849,9 +27849,9 @@ void Player::ReadMovementInfo(WorldPacket& data, MovementInfo* mi, Movement::Ext if (hasTransportData && hasTransportTime2) data >> mi->transport.time2; break; - case MSETransportTime3: - if (hasTransportData && hasTransportTime3) - data >> mi->transport.time3; + case MSETransportVehicleId: + if (hasTransportData && hasTransportVehicleId) + data >> mi->transport.vehicleId; break; case MSEPitch: if (hasPitch) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 30a22f4d193..1e5e0f44a70 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -15597,7 +15597,7 @@ void Unit::WriteMovementInfo(WorldPacket& data, Movement::ExtraMovementStatusEle bool hasSpline = IsSplineEnabled(); bool hasTransportTime2 = hasTransportData && m_movementInfo.transport.time2 != 0; - bool hasTransportTime3 = false; + bool hasTransportVehicleId = hasTransportData && m_movementInfo.transport.vehicleId != 0; bool hasPitch = HasUnitMovementFlag(MovementFlags(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING)) || HasExtraUnitMovementFlag(MOVEMENTFLAG2_ALWAYS_ALLOW_PITCHING); bool hasFallDirection = HasUnitMovementFlag(MOVEMENTFLAG_FALLING); bool hasFallData = hasFallDirection || m_movementInfo.jump.fallTime != 0; @@ -15682,7 +15682,7 @@ void Unit::WriteMovementInfo(WorldPacket& data, Movement::ExtraMovementStatusEle break; case MSEHasTransportTime3: if (hasTransportData) - data.WriteBit(hasTransportTime3); + data.WriteBit(hasTransportVehicleId); break; case MSEHasPitch: data.WriteBit(!hasPitch); @@ -15753,9 +15753,9 @@ void Unit::WriteMovementInfo(WorldPacket& data, Movement::ExtraMovementStatusEle if (hasTransportData && hasTransportTime2) data << mi.transport.time2; break; - case MSETransportTime3: - if (hasTransportData && hasTransportTime3) - data << mi.transport.time3; + case MSETransportVehicleId: + if (hasTransportData && hasTransportVehicleId) + data << mi.transport.vehicleId; break; case MSEPitch: if (hasPitch) diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 3eefc7d9209..12e2eb55480 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -802,6 +802,7 @@ bool VehicleJoinEvent::Execute(uint64, uint32) Passenger->m_movementInfo.transport.time = 0; Passenger->m_movementInfo.transport.seat = Seat->first; Passenger->m_movementInfo.transport.guid = Target->GetBase()->GetGUID(); + Passenger->m_movementInfo.transport.vehicleId = Target->GetVehicleInfo()->m_ID; if (Target->GetBase()->GetTypeId() == TYPEID_UNIT && Passenger->GetTypeId() == TYPEID_PLAYER && Seat->second.SeatInfo->m_flags & VEHICLE_SEAT_FLAG_CAN_CONTROL) diff --git a/src/server/game/Movement/MovementStructures.cpp b/src/server/game/Movement/MovementStructures.cpp index 242b2aeaca7..62998aee7fc 100644 --- a/src/server/game/Movement/MovementStructures.cpp +++ b/src/server/game/Movement/MovementStructures.cpp @@ -62,7 +62,7 @@ MovementStatusElements const PlayerMove[] = MSEGuidByte7, MSEPositionY, MSEGuidByte3, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte6, MSETransportSeat, MSETransportGuidByte5, @@ -140,7 +140,7 @@ MovementStatusElements const MovementFallLand[] = MSETransportPositionY, MSETransportPositionX, MSETransportGuidByte5, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte1, MSETransportSeat, MSETransportTime2, @@ -218,7 +218,7 @@ MovementStatusElements const MovementHeartBeat[] = MSETransportGuidByte1, MSETransportGuidByte3, MSETransportGuidByte7, - MSETransportTime3, + MSETransportVehicleId, MSETransportTime2, MSETransportGuidByte2, MSETransportGuidByte0, @@ -283,7 +283,7 @@ MovementStatusElements const MovementJump[] = MSETransportGuidByte7, MSETransportPositionX, MSETransportGuidByte4, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte0, MSETransportOrientation, MSETransportTime2, @@ -359,7 +359,7 @@ MovementStatusElements const MovementSetFacing[] = MSETransportPositionZ, MSETransportOrientation, MSETransportGuidByte2, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte3, MSETransportSeat, MSETransportPositionY, @@ -428,7 +428,7 @@ MovementStatusElements const MovementSetPitch[] = MSETransportGuidByte6, MSETransportOrientation, MSETransportGuidByte1, - MSETransportTime3, + MSETransportVehicleId, MSETransportTime, MSETransportGuidByte2, MSETransportPositionZ, @@ -497,7 +497,7 @@ MovementStatusElements const MovementStartBackward[] = MSEGuidByte3, MSETransportPositionZ, MSETransportGuidByte2, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte0, MSETransportGuidByte5, MSETransportPositionY, @@ -582,7 +582,7 @@ MovementStatusElements const MovementStartForward[] = MSETransportGuidByte2, MSETransportPositionX, MSETransportGuidByte5, - MSETransportTime3, + MSETransportVehicleId, MSETransportTime, MSETransportGuidByte6, MSETransportGuidByte0, @@ -650,7 +650,7 @@ MovementStatusElements const MovementStartStrafeLeft[] = MSETransportTime2, MSETransportGuidByte3, MSETransportPositionZ, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte0, MSETransportGuidByte7, MSETransportPositionY, @@ -721,7 +721,7 @@ MovementStatusElements const MovementStartStrafeRight[] = MSETransportGuidByte2, MSETransportSeat, MSETransportPositionX, - MSETransportTime3, + MSETransportVehicleId, MSETransportTime, MSETransportGuidByte4, MSETransportGuidByte7, @@ -801,7 +801,7 @@ MovementStatusElements const MovementStartTurnLeft[] = MSETransportGuidByte1, MSETransportGuidByte3, MSETransportPositionY, - MSETransportTime3, + MSETransportVehicleId, MSETransportTime2, MSETransportGuidByte5, MSETransportGuidByte7, @@ -865,7 +865,7 @@ MovementStatusElements const MovementStartTurnRight[] = MSETransportSeat, MSETransportOrientation, MSETransportGuidByte5, - MSETransportTime3, + MSETransportVehicleId, MSETransportPositionZ, MSETransportPositionX, MSETransportTime, @@ -933,7 +933,7 @@ MovementStatusElements const MovementStop[] = MSETransportTime, MSETransportSeat, MSETransportPositionZ, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte2, MSETransportGuidByte0, MSETransportPositionY, @@ -1003,7 +1003,7 @@ MovementStatusElements const MovementStopStrafe[] = MSETransportSeat, MSETransportGuidByte6, MSETransportPositionZ, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte1, MSETransportGuidByte3, MSETransportGuidByte2, @@ -1080,7 +1080,7 @@ MovementStatusElements const MovementStopTurn[] = MSETransportGuidByte3, MSETransportOrientation, MSETransportTime2, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte7, MSETransportGuidByte1, MSETransportGuidByte0, @@ -1154,7 +1154,7 @@ MovementStatusElements const MovementStartAscend[] = MSETransportGuidByte7, MSETransportTime2, MSETransportPositionZ, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte6, MSETransportTime, MSETransportGuidByte0, @@ -1219,7 +1219,7 @@ MovementStatusElements const MovementStartDescend[] = MSEPitch, MSETransportPositionZ, MSETransportSeat, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte6, MSETransportTime2, MSETransportGuidByte1, @@ -1296,7 +1296,7 @@ MovementStatusElements const MovementStartSwim[] = MSETransportTime, MSETransportPositionX, MSETransportOrientation, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte6, MSETransportGuidByte5, MSETransportGuidByte4, @@ -1360,7 +1360,7 @@ MovementStatusElements const MovementStopSwim[] = MSEGuidByte1, MSEGuidByte5, MSEGuidByte2, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte4, MSETransportTime, MSETransportPositionZ, @@ -1438,7 +1438,7 @@ MovementStatusElements const MovementStopAscend[] = MSETransportGuidByte2, MSETransportGuidByte6, MSETransportTime2, - MSETransportTime3, + MSETransportVehicleId, MSETransportOrientation, MSETransportGuidByte3, MSETransportGuidByte4, @@ -1519,7 +1519,7 @@ MovementStatusElements const MovementStopPitch[] = MSETransportGuidByte3, MSETransportGuidByte1, MSETransportPositionZ, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte0, MSETransportGuidByte4, MSETransportTime, @@ -1576,7 +1576,7 @@ MovementStatusElements const MovementStartPitchDown[] = MSEGuidByte6, MSEGuidByte4, MSEGuidByte1, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte3, MSETransportTime2, MSETransportGuidByte5, @@ -1661,7 +1661,7 @@ MovementStatusElements const MovementStartPitchUp[] = MSETransportSeat, MSETransportGuidByte6, MSETransportGuidByte5, - MSETransportTime3, + MSETransportVehicleId, MSETransportPositionY, MSETransportGuidByte4, MSEFallTime, @@ -1729,7 +1729,7 @@ MovementStatusElements const MoveChngTransport[]= MSETransportGuidByte6, MSETransportPositionZ, MSETransportPositionX, - MSETransportTime3, + MSETransportVehicleId, MSETransportTime, MSETransportGuidByte7, MSETransportGuidByte5, @@ -1806,7 +1806,7 @@ MovementStatusElements const MoveSplineDone[] = MSEOrientation, MSETransportGuidByte1, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte7, MSETransportTime, MSETransportPositionY, @@ -1881,7 +1881,7 @@ MovementStatusElements const MoveNotActiveMover[] = MSEFallHorizontalSpeed, MSEFallTime, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte1, MSETransportTime2, MSETransportOrientation, @@ -1956,7 +1956,7 @@ MovementStatusElements const DismissControlledVehicle[] = MSETimestamp, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte4, MSETransportGuidByte7, MSETransportTime2, @@ -2031,7 +2031,7 @@ MovementStatusElements const MoveUpdateTeleport[] = MSETransportGuidByte3, MSETransportGuidByte4, MSETransportOrientation, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte1, MSETransportTime2, MSETransportPositionZ, @@ -2124,7 +2124,7 @@ MovementStatusElements const MovementSetRunMode[] = MSETransportOrientation, MSETransportGuidByte4, MSETransportTime, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte0, MSETransportPositionY, MSETransportGuidByte6, @@ -2195,7 +2195,7 @@ MovementStatusElements const MovementSetWalkMode[] = MSETransportTime2, MSETransportOrientation, MSETransportPositionX, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte7, MSETransportPositionY, MSETransportGuidByte1, @@ -2270,7 +2270,7 @@ MovementStatusElements const MovementSetCanFly[] = MSETransportGuidByte0, MSETransportOrientation, MSETransportGuidByte6, - MSETransportTime3, + MSETransportVehicleId, MSESplineElevation, MSEFallSinAngle, MSEFallCosAngle, @@ -2348,7 +2348,7 @@ MovementStatusElements const MovementSetCanTransitionBetweenSwimAndFlyAck[] = MSETransportTime2, MSETransportGuidByte6, MSETransportOrientation, - MSETransportTime3, + MSETransportVehicleId, MSEPitch, MSEOrientation, MSETimestamp, @@ -2467,7 +2467,7 @@ MovementStatusElements const MovementUpdateRunSpeed[] = MSETransportPositionY, MSETransportGuidByte3, MSETransportGuidByte2, - MSETransportTime3, + MSETransportVehicleId, MSETransportPositionZ, MSETimestamp, MSEFallCosAngle, @@ -2667,7 +2667,7 @@ MovementStatusElements const MovementForceRunSpeedChangeAck[] = MSETransportGuidByte7, MSETransportOrientation, MSETransportGuidByte3, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte2, MSETransportSeat, MSETransportGuidByte4, @@ -2745,7 +2745,7 @@ MovementStatusElements const MovementSetCollisionHeightAck[] = MSETransportGuidByte6, MSETransportGuidByte3, MSETransportGuidByte1, - MSETransportTime3, + MSETransportVehicleId, MSETransportPositionZ, MSEFallVerticalSpeed, MSEFallTime, @@ -2812,7 +2812,7 @@ MovementStatusElements const MovementForceFlightSpeedChangeAck[] = MSETransportOrientation, MSETransportGuidByte1, MSETransportGuidByte5, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte2, MSETransportPositionZ, MSETransportGuidByte7, @@ -2881,7 +2881,7 @@ MovementStatusElements const MovementSetCanFlyAck[] = MSETransportTime2, MSETransportGuidByte6, MSETransportTime, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte7, MSETransportPositionZ, MSETransportGuidByte3, @@ -2953,7 +2953,7 @@ MovementStatusElements const MovementForceSwimSpeedChangeAck[] = MSEGuidByte4, MSEGuidByte7, MSETransportGuidByte0, - MSETransportTime3, + MSETransportVehicleId, MSETransportTime2, MSETransportPositionX, MSETransportGuidByte7, @@ -3037,7 +3037,7 @@ MovementStatusElements const MovementForceWalkSpeedChangeAck[] = MSETransportPositionX, MSETransportGuidByte0, MSETransportTime, - MSETransportTime3, + MSETransportVehicleId, MSETransportPositionY, MSETransportGuidByte2, MSETransportGuidByte4, @@ -3112,7 +3112,7 @@ MovementStatusElements const MovementForceRunBackSpeedChangeAck[] = MSETransportGuidByte0, MSETransportGuidByte2, MSETransportPositionY, - MSETransportTime3, + MSETransportVehicleId, MSETransportPositionX, MSETransportOrientation, MSETransportGuidByte3, @@ -3297,7 +3297,7 @@ MovementStatusElements const ForceMoveRootAck[] = MSETransportGuidByte4, MSETransportOrientation, MSETransportPositionZ, - MSETransportTime3, + MSETransportVehicleId, MSETransportTime2, MSETransportGuidByte7, MSETransportGuidByte2, @@ -3371,7 +3371,7 @@ MovementStatusElements const ForceMoveUnrootAck[] = MSETransportGuidByte2, MSETransportGuidByte3, MSETransportPositionY, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte5, MSETransportSeat, MSETransportGuidByte0, @@ -3448,7 +3448,7 @@ MovementStatusElements const MovementFallReset[] = MSETransportSeat, MSETransportTime2, MSETransportGuidByte6, - MSETransportTime3, + MSETransportVehicleId, MSETransportTime, MSETransportGuidByte0, MSETransportOrientation, @@ -3511,7 +3511,7 @@ MovementStatusElements const MovementFeatherFallAck[] = MSEGuidByte4, MSEGuidByte3, MSEGuidByte2, - MSETransportTime3, + MSETransportVehicleId, MSETransportOrientation, MSETransportPositionZ, MSETransportGuidByte7, @@ -3599,7 +3599,7 @@ MovementStatusElements const MovementGravityDisableAck[] = MSETransportTime2, MSETransportPositionX, MSETransportGuidByte7, - MSETransportTime3, + MSETransportVehicleId, MSEFallSinAngle, MSEFallCosAngle, MSEFallHorizontalSpeed, @@ -3664,7 +3664,7 @@ MovementStatusElements const MovementGravityEnableAck[] = MSEFallVerticalSpeed, MSETransportGuidByte1, MSETransportPositionX, - MSETransportTime3, + MSETransportVehicleId, MSETransportOrientation, MSETransportGuidByte2, MSETransportGuidByte0, @@ -3738,7 +3738,7 @@ MovementStatusElements const MovementHoverAck[] = MSEFallVerticalSpeed, MSEOrientation, MSETransportGuidByte1, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte2, MSETransportGuidByte7, MSETransportGuidByte3, @@ -3818,7 +3818,7 @@ MovementStatusElements const MovementKnockBackAck[] = MSETransportTime, MSETransportGuidByte3, MSETransportGuidByte1, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte2, MSETransportPositionZ, MSETransportGuidByte0, @@ -3878,7 +3878,7 @@ MovementStatusElements const MovementWaterWalkAck[] = MSEGuidByte1, MSETransportPositionX, MSETransportGuidByte1, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte0, MSETransportOrientation, MSETransportGuidByte7, @@ -5018,7 +5018,7 @@ MovementStatusElements const ChangeSeatsOnControlledVehicle[] = MSEFallVerticalSpeed, MSETransportGuidByte2, MSETransportTime2, - MSETransportTime3, + MSETransportVehicleId, MSETransportGuidByte0, MSETransportTime, MSETransportSeat, @@ -5087,7 +5087,7 @@ MovementStatusElements const CastSpellEmbeddedMovement[] = MSETransportTime, MSETransportGuidByte6, MSETransportGuidByte5, - MSETransportTime3, + MSETransportVehicleId, MSETransportPositionX, MSETransportGuidByte4, MSETransportPositionZ, diff --git a/src/server/game/Movement/MovementStructures.h b/src/server/game/Movement/MovementStructures.h index 278eaa877fa..c98b2303e6a 100644 --- a/src/server/game/Movement/MovementStructures.h +++ b/src/server/game/Movement/MovementStructures.h @@ -86,7 +86,7 @@ enum MovementStatusElements MSETransportSeat, MSETransportTime, MSETransportTime2, - MSETransportTime3, + MSETransportVehicleId, MSEPitch, MSEFallTime, MSEFallVerticalSpeed,