From d28edcd2fc3f63167fa4a09d2fb76799c802118f Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 17 Aug 2017 14:11:00 -0400 Subject: [PATCH] Renamed "movementInfo" to "Status" in movement packets --- Game/Chat/Commands/DebugCommands.cs | 2 +- Game/Entities/Player/Player.cs | 2 +- Game/Entities/Unit/Unit.Movement.cs | 30 +++++++++++------------ Game/Handlers/MovementHandler.cs | 22 ++++++++--------- Game/Handlers/VehicleHandler.cs | 2 +- Game/Network/Packets/MovementPackets.cs | 32 ++++++++++++------------- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Game/Chat/Commands/DebugCommands.cs b/Game/Chat/Commands/DebugCommands.cs index dd86da9fd..830ef105e 100644 --- a/Game/Chat/Commands/DebugCommands.cs +++ b/Game/Chat/Commands/DebugCommands.cs @@ -653,7 +653,7 @@ namespace Game.Chat else { MoveUpdate moveUpdate = new MoveUpdate(); - moveUpdate.movementInfo = target.m_movementInfo; + moveUpdate.Status = target.m_movementInfo; target.SendMessageToSet(moveUpdate, true); } diff --git a/Game/Entities/Player/Player.cs b/Game/Entities/Player/Player.cs index b0ec75e47..bf35ee7f5 100644 --- a/Game/Entities/Player/Player.cs +++ b/Game/Entities/Player/Player.cs @@ -5019,7 +5019,7 @@ namespace Game.Entities SendPacket(setCollisionHeight); MoveUpdateCollisionHeight updateCollisionHeight = new MoveUpdateCollisionHeight(); - updateCollisionHeight.movementInfo = m_movementInfo; + updateCollisionHeight.Status = m_movementInfo; updateCollisionHeight.Height = height; updateCollisionHeight.Scale = GetObjectScale(); SendMessageToSet(updateCollisionHeight, false); diff --git a/Game/Entities/Unit/Unit.Movement.cs b/Game/Entities/Unit/Unit.Movement.cs index 440031263..c143174ed 100644 --- a/Game/Entities/Unit/Unit.Movement.cs +++ b/Game/Entities/Unit/Unit.Movement.cs @@ -133,7 +133,7 @@ namespace Game.Entities // Send notification to other players MoveUpdateSpeed packet = new MoveUpdateSpeed(moveTypeToOpcode[(int)mtype, 2]); - packet.movementInfo = m_movementInfo; + packet.Status = m_movementInfo; packet.Speed = GetSpeed(mtype); playerMover.SendMessageToSet(packet, false); } @@ -249,7 +249,7 @@ namespace Game.Entities playerMover.SendPacket(packet); MoveUpdate moveUpdate = new MoveUpdate(); - moveUpdate.movementInfo = m_movementInfo; + moveUpdate.Status = m_movementInfo; SendMessageToSet(moveUpdate, playerMover); } else @@ -284,7 +284,7 @@ namespace Game.Entities playerMover.SendPacket(packet); MoveUpdate moveUpdate = new MoveUpdate(); - moveUpdate.movementInfo = m_movementInfo; + moveUpdate.Status = m_movementInfo; SendMessageToSet(moveUpdate, playerMover); } @@ -310,7 +310,7 @@ namespace Game.Entities playerMover.SendPacket(packet); MoveUpdate moveUpdate = new MoveUpdate(); - moveUpdate.movementInfo = m_movementInfo; + moveUpdate.Status = m_movementInfo; SendMessageToSet(moveUpdate, playerMover); } @@ -336,7 +336,7 @@ namespace Game.Entities playerMover.SendPacket(packet); MoveUpdate moveUpdate = new MoveUpdate(); - moveUpdate.movementInfo = m_movementInfo; + moveUpdate.Status = m_movementInfo; SendMessageToSet(moveUpdate, playerMover); } @@ -628,7 +628,7 @@ namespace Game.Entities playerMover.SendPacket(packet); MoveUpdate moveUpdate = new MoveUpdate(); - moveUpdate.movementInfo = m_movementInfo; + moveUpdate.Status = m_movementInfo; SendMessageToSet(moveUpdate, playerMover); } else @@ -818,7 +818,7 @@ namespace Game.Entities playerMover.SendPacket(packet); MoveUpdate moveUpdate = new MoveUpdate(); - moveUpdate.movementInfo = m_movementInfo; + moveUpdate.Status = m_movementInfo; SendMessageToSet(moveUpdate, playerMover); } else @@ -851,7 +851,7 @@ namespace Game.Entities playerMover.SendPacket(packet); MoveUpdate moveUpdate = new MoveUpdate(); - moveUpdate.movementInfo = m_movementInfo; + moveUpdate.Status = m_movementInfo; SendMessageToSet(moveUpdate, playerMover); } else @@ -883,7 +883,7 @@ namespace Game.Entities playerMover.SendPacket(packet); MoveUpdate moveUpdate = new MoveUpdate(); - moveUpdate.movementInfo = m_movementInfo; + moveUpdate.Status = m_movementInfo; SendMessageToSet(moveUpdate, playerMover); } else @@ -929,7 +929,7 @@ namespace Game.Entities playerMover.SendPacket(packet); MoveUpdate moveUpdate = new MoveUpdate(); - moveUpdate.movementInfo = m_movementInfo; + moveUpdate.Status = m_movementInfo; SendMessageToSet(moveUpdate, playerMover); } else @@ -1141,7 +1141,7 @@ namespace Game.Entities playerMover.SendPacket(packet); MoveUpdate moveUpdate = new MoveUpdate(); - moveUpdate.movementInfo = m_movementInfo; + moveUpdate.Status = m_movementInfo; SendMessageToSet(moveUpdate, playerMover); } else @@ -1492,7 +1492,7 @@ namespace Game.Entities // SMSG_MOVE_TELEPORT is sent to self in order to trigger CMSG_MOVE_TELEPORT_ACK and update the position server side MoveUpdateTeleport moveUpdateTeleport = new MoveUpdateTeleport(); - moveUpdateTeleport.movementInfo = m_movementInfo; + moveUpdateTeleport.Status = m_movementInfo; Unit broadcastSource = this; Player playerMover = GetPlayerBeingMoved(); @@ -1519,9 +1519,9 @@ namespace Game.Entities { // This is the only packet sent for creatures which contains MovementInfo structure // we do not update m_movementInfo for creatures so it needs to be done manually here - moveUpdateTeleport.movementInfo.Guid = GetGUID(); - moveUpdateTeleport.movementInfo.Pos.Relocate(pos); - moveUpdateTeleport.movementInfo.Time = Time.GetMSTime(); + moveUpdateTeleport.Status.Guid = GetGUID(); + moveUpdateTeleport.Status.Pos.Relocate(pos); + moveUpdateTeleport.Status.Time = Time.GetMSTime(); } // Broadcast the packet to everyone except self. diff --git a/Game/Handlers/MovementHandler.cs b/Game/Handlers/MovementHandler.cs index 7871d434d..b2f1bced2 100644 --- a/Game/Handlers/MovementHandler.cs +++ b/Game/Handlers/MovementHandler.cs @@ -58,7 +58,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.MoveDoubleJump, Processing = PacketProcessing.ThreadSafe)] void HandleMovement(ClientPlayerMovement packet) { - HandleMovementOpcode(packet.GetOpcode(), packet.movementInfo); + HandleMovementOpcode(packet.GetOpcode(), packet.Status); } void HandleMovementOpcode(ClientOpcodes opcode, MovementInfo movementInfo) @@ -167,7 +167,7 @@ namespace Game mover.UpdatePosition(movementInfo.Pos); MoveUpdate moveUpdate = new MoveUpdate(); - moveUpdate.movementInfo = mover.m_movementInfo; + moveUpdate.Status = mover.m_movementInfo; mover.SendMessageToSet(moveUpdate, GetPlayer()); if (plrMover) // nothing is charmed, or player charmed @@ -469,10 +469,10 @@ namespace Game [WorldPacketHandler(ClientOpcodes.MoveForceWalkSpeedChangeAck, Processing = PacketProcessing.ThreadSafe)] void HandleForceSpeedChangeAck(MovementSpeedAck packet) { - GetPlayer().ValidateMovementInfo(packet.Ack.movementInfo); + GetPlayer().ValidateMovementInfo(packet.Ack.Status); // now can skip not our packet - if (GetPlayer().GetGUID() != packet.Ack.movementInfo.Guid) + if (GetPlayer().GetGUID() != packet.Ack.Status.Guid) return; /*----------------*/ @@ -554,15 +554,15 @@ namespace Game [WorldPacketHandler(ClientOpcodes.MoveKnockBackAck, Processing = PacketProcessing.ThreadSafe)] void HandleMoveKnockBackAck(MoveKnockBackAck movementAck) { - GetPlayer().ValidateMovementInfo(movementAck.Ack.movementInfo); + GetPlayer().ValidateMovementInfo(movementAck.Ack.Status); - if (GetPlayer().m_unitMovedByMe.GetGUID() != movementAck.Ack.movementInfo.Guid) + if (GetPlayer().m_unitMovedByMe.GetGUID() != movementAck.Ack.Status.Guid) return; - GetPlayer().m_movementInfo = movementAck.Ack.movementInfo; + GetPlayer().m_movementInfo = movementAck.Ack.Status; MoveUpdateKnockBack updateKnockBack = new MoveUpdateKnockBack(); - updateKnockBack.movementInfo = GetPlayer().m_movementInfo; + updateKnockBack.Status = GetPlayer().m_movementInfo; GetPlayer().SendMessageToSet(updateKnockBack, false); } @@ -580,7 +580,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.MoveEnableDoubleJumpAck, Processing = PacketProcessing.ThreadSafe)] void HandleMovementAckMessage(MovementAckMessage movementAck) { - GetPlayer().ValidateMovementInfo(movementAck.Ack.movementInfo); + GetPlayer().ValidateMovementInfo(movementAck.Ack.Status); } [WorldPacketHandler(ClientOpcodes.SummonResponse)] @@ -595,7 +595,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.MoveSetCollisionHeightAck, Processing = PacketProcessing.ThreadSafe)] void HandleSetCollisionHeightAck(MoveSetCollisionHeightAck packet) { - GetPlayer().ValidateMovementInfo(packet.Data.movementInfo); + GetPlayer().ValidateMovementInfo(packet.Data.Status); } [WorldPacketHandler(ClientOpcodes.MoveTimeSkipped, Processing = PacketProcessing.Inplace)] @@ -606,7 +606,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.MoveSplineDone, Processing = PacketProcessing.ThreadSafe)] void HandleMoveSplineDoneOpcode(MoveSplineDone moveSplineDone) { - MovementInfo movementInfo = moveSplineDone.movementInfo; + MovementInfo movementInfo = moveSplineDone.Status; _player.ValidateMovementInfo(movementInfo); // in taxi flight packet received in 2 case: diff --git a/Game/Handlers/VehicleHandler.cs b/Game/Handlers/VehicleHandler.cs index 45bdb6dc3..0039dc278 100644 --- a/Game/Handlers/VehicleHandler.cs +++ b/Game/Handlers/VehicleHandler.cs @@ -210,7 +210,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.MoveSetVehicleRecIdAck)] void HandleMoveSetVehicleRecAck(MoveSetVehicleRecIdAck setVehicleRecIdAck) { - GetPlayer().ValidateMovementInfo(setVehicleRecIdAck.Data.movementInfo); + GetPlayer().ValidateMovementInfo(setVehicleRecIdAck.Data.Status); } } } diff --git a/Game/Network/Packets/MovementPackets.cs b/Game/Network/Packets/MovementPackets.cs index b0f30ea84..0f31883af 100644 --- a/Game/Network/Packets/MovementPackets.cs +++ b/Game/Network/Packets/MovementPackets.cs @@ -268,10 +268,10 @@ namespace Game.Network.Packets public override void Read() { - movementInfo = MovementExtensions.ReadMovementInfo(_worldPacket); + Status = MovementExtensions.ReadMovementInfo(_worldPacket); } - public MovementInfo movementInfo; + public MovementInfo Status; } public class MoveUpdate : ServerPacket @@ -280,10 +280,10 @@ namespace Game.Network.Packets public override void Write() { - MovementExtensions.WriteMovementInfo(_worldPacket, movementInfo); + MovementExtensions.WriteMovementInfo(_worldPacket, Status); } - public MovementInfo movementInfo; + public MovementInfo Status; } public class MonsterMove : ServerPacket @@ -417,11 +417,11 @@ namespace Game.Network.Packets public override void Write() { - MovementExtensions.WriteMovementInfo(_worldPacket, movementInfo); + MovementExtensions.WriteMovementInfo(_worldPacket, Status); _worldPacket.WriteFloat(Speed); } - public MovementInfo movementInfo; + public MovementInfo Status; public float Speed = 1.0f; } @@ -574,7 +574,7 @@ namespace Game.Network.Packets public override void Write() { - MovementExtensions.WriteMovementInfo(_worldPacket, movementInfo); + MovementExtensions.WriteMovementInfo(_worldPacket, Status); _worldPacket.WriteInt32(MovementForces.Count); _worldPacket.WriteBit(WalkSpeed.HasValue); @@ -619,7 +619,7 @@ namespace Game.Network.Packets _worldPacket.WriteFloat(PitchRate.Value); } - public MovementInfo movementInfo; + public MovementInfo Status; public List MovementForces = new List(); public Optional SwimBackSpeed; public Optional FlightSpeed; @@ -750,10 +750,10 @@ namespace Game.Network.Packets public override void Write() { - MovementExtensions.WriteMovementInfo(_worldPacket, movementInfo); + MovementExtensions.WriteMovementInfo(_worldPacket, Status); } - public MovementInfo movementInfo; + public MovementInfo Status; } class MoveKnockBackAck : ClientPacket @@ -805,12 +805,12 @@ namespace Game.Network.Packets public override void Write() { - MovementExtensions.WriteMovementInfo(_worldPacket, movementInfo); + MovementExtensions.WriteMovementInfo(_worldPacket, Status); _worldPacket.WriteFloat(Height); _worldPacket.WriteFloat(Scale); } - public MovementInfo movementInfo; + public MovementInfo Status; public float Scale = 1.0f; public float Height = 1.0f; } @@ -882,11 +882,11 @@ namespace Game.Network.Packets public override void Read() { - movementInfo = MovementExtensions.ReadMovementInfo(_worldPacket); + Status = MovementExtensions.ReadMovementInfo(_worldPacket); SplineID = _worldPacket.ReadInt32(); } - public MovementInfo movementInfo; + public MovementInfo Status; public int SplineID; } @@ -1226,11 +1226,11 @@ namespace Game.Network.Packets { public void Read(WorldPacket data) { - movementInfo = MovementExtensions.ReadMovementInfo(data); + Status = MovementExtensions.ReadMovementInfo(data); AckIndex = data.ReadInt32(); } - public MovementInfo movementInfo; + public MovementInfo Status; public int AckIndex; }