Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed "movementInfo" to "Status" in movement packets

Browse Source
This commit is contained in:
hondacrx
2017-08-17 14:11:00 -04:00
parent 8d113d506d
commit d28edcd2fc
6 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Game/Chat/Commands/DebugCommands.cs
+1 -1
View File
@@ -653,7 +653,7 @@ namespace Game.Chat
else else
{ {
MoveUpdate moveUpdate = new MoveUpdate(); MoveUpdate moveUpdate = new MoveUpdate();
moveUpdate.movementInfo = target.m_movementInfo; moveUpdate.Status = target.m_movementInfo;
target.SendMessageToSet(moveUpdate, true); target.SendMessageToSet(moveUpdate, true);
} }
Game/Entities/Player/Player.cs
+1 -1
View File
@@ -5019,7 +5019,7 @@ namespace Game.Entities
SendPacket(setCollisionHeight); SendPacket(setCollisionHeight);
MoveUpdateCollisionHeight updateCollisionHeight = new MoveUpdateCollisionHeight(); MoveUpdateCollisionHeight updateCollisionHeight = new MoveUpdateCollisionHeight();
updateCollisionHeight.movementInfo = m_movementInfo; updateCollisionHeight.Status = m_movementInfo;
updateCollisionHeight.Height = height; updateCollisionHeight.Height = height;
updateCollisionHeight.Scale = GetObjectScale(); updateCollisionHeight.Scale = GetObjectScale();
SendMessageToSet(updateCollisionHeight, false); SendMessageToSet(updateCollisionHeight, false);
Game/Entities/Unit/Unit.Movement.cs
+15 -15
View File
@@ -133,7 +133,7 @@ namespace Game.Entities
// Send notification to other players // Send notification to other players
MoveUpdateSpeed packet = new MoveUpdateSpeed(moveTypeToOpcode[(int)mtype, 2]); MoveUpdateSpeed packet = new MoveUpdateSpeed(moveTypeToOpcode[(int)mtype, 2]);
packet.movementInfo = m_movementInfo; packet.Status = m_movementInfo;
packet.Speed = GetSpeed(mtype); packet.Speed = GetSpeed(mtype);
playerMover.SendMessageToSet(packet, false); playerMover.SendMessageToSet(packet, false);
} }
@@ -249,7 +249,7 @@ namespace Game.Entities
playerMover.SendPacket(packet); playerMover.SendPacket(packet);
MoveUpdate moveUpdate = new MoveUpdate(); MoveUpdate moveUpdate = new MoveUpdate();
moveUpdate.movementInfo = m_movementInfo; moveUpdate.Status = m_movementInfo;
SendMessageToSet(moveUpdate, playerMover); SendMessageToSet(moveUpdate, playerMover);
} }
else else
@@ -284,7 +284,7 @@ namespace Game.Entities
playerMover.SendPacket(packet); playerMover.SendPacket(packet);
MoveUpdate moveUpdate = new MoveUpdate(); MoveUpdate moveUpdate = new MoveUpdate();
moveUpdate.movementInfo = m_movementInfo; moveUpdate.Status = m_movementInfo;
SendMessageToSet(moveUpdate, playerMover); SendMessageToSet(moveUpdate, playerMover);
} }
@@ -310,7 +310,7 @@ namespace Game.Entities
playerMover.SendPacket(packet); playerMover.SendPacket(packet);
MoveUpdate moveUpdate = new MoveUpdate(); MoveUpdate moveUpdate = new MoveUpdate();
moveUpdate.movementInfo = m_movementInfo; moveUpdate.Status = m_movementInfo;
SendMessageToSet(moveUpdate, playerMover); SendMessageToSet(moveUpdate, playerMover);
} }
@@ -336,7 +336,7 @@ namespace Game.Entities
playerMover.SendPacket(packet); playerMover.SendPacket(packet);
MoveUpdate moveUpdate = new MoveUpdate(); MoveUpdate moveUpdate = new MoveUpdate();
moveUpdate.movementInfo = m_movementInfo; moveUpdate.Status = m_movementInfo;
SendMessageToSet(moveUpdate, playerMover); SendMessageToSet(moveUpdate, playerMover);
} }
@@ -628,7 +628,7 @@ namespace Game.Entities
playerMover.SendPacket(packet); playerMover.SendPacket(packet);
MoveUpdate moveUpdate = new MoveUpdate(); MoveUpdate moveUpdate = new MoveUpdate();
moveUpdate.movementInfo = m_movementInfo; moveUpdate.Status = m_movementInfo;
SendMessageToSet(moveUpdate, playerMover); SendMessageToSet(moveUpdate, playerMover);
} }
else else
@@ -818,7 +818,7 @@ namespace Game.Entities
playerMover.SendPacket(packet); playerMover.SendPacket(packet);
MoveUpdate moveUpdate = new MoveUpdate(); MoveUpdate moveUpdate = new MoveUpdate();
moveUpdate.movementInfo = m_movementInfo; moveUpdate.Status = m_movementInfo;
SendMessageToSet(moveUpdate, playerMover); SendMessageToSet(moveUpdate, playerMover);
} }
else else
@@ -851,7 +851,7 @@ namespace Game.Entities
playerMover.SendPacket(packet); playerMover.SendPacket(packet);
MoveUpdate moveUpdate = new MoveUpdate(); MoveUpdate moveUpdate = new MoveUpdate();
moveUpdate.movementInfo = m_movementInfo; moveUpdate.Status = m_movementInfo;
SendMessageToSet(moveUpdate, playerMover); SendMessageToSet(moveUpdate, playerMover);
} }
else else
@@ -883,7 +883,7 @@ namespace Game.Entities
playerMover.SendPacket(packet); playerMover.SendPacket(packet);
MoveUpdate moveUpdate = new MoveUpdate(); MoveUpdate moveUpdate = new MoveUpdate();
moveUpdate.movementInfo = m_movementInfo; moveUpdate.Status = m_movementInfo;
SendMessageToSet(moveUpdate, playerMover); SendMessageToSet(moveUpdate, playerMover);
} }
else else
@@ -929,7 +929,7 @@ namespace Game.Entities
playerMover.SendPacket(packet); playerMover.SendPacket(packet);
MoveUpdate moveUpdate = new MoveUpdate(); MoveUpdate moveUpdate = new MoveUpdate();
moveUpdate.movementInfo = m_movementInfo; moveUpdate.Status = m_movementInfo;
SendMessageToSet(moveUpdate, playerMover); SendMessageToSet(moveUpdate, playerMover);
} }
else else
@@ -1141,7 +1141,7 @@ namespace Game.Entities
playerMover.SendPacket(packet); playerMover.SendPacket(packet);
MoveUpdate moveUpdate = new MoveUpdate(); MoveUpdate moveUpdate = new MoveUpdate();
moveUpdate.movementInfo = m_movementInfo; moveUpdate.Status = m_movementInfo;
SendMessageToSet(moveUpdate, playerMover); SendMessageToSet(moveUpdate, playerMover);
} }
else 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 // 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 moveUpdateTeleport = new MoveUpdateTeleport();
moveUpdateTeleport.movementInfo = m_movementInfo; moveUpdateTeleport.Status = m_movementInfo;
Unit broadcastSource = this; Unit broadcastSource = this;
Player playerMover = GetPlayerBeingMoved(); Player playerMover = GetPlayerBeingMoved();
@@ -1519,9 +1519,9 @@ namespace Game.Entities
{ {
// This is the only packet sent for creatures which contains MovementInfo structure // 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 // we do not update m_movementInfo for creatures so it needs to be done manually here
moveUpdateTeleport.movementInfo.Guid = GetGUID(); moveUpdateTeleport.Status.Guid = GetGUID();
moveUpdateTeleport.movementInfo.Pos.Relocate(pos); moveUpdateTeleport.Status.Pos.Relocate(pos);
moveUpdateTeleport.movementInfo.Time = Time.GetMSTime(); moveUpdateTeleport.Status.Time = Time.GetMSTime();
} }
// Broadcast the packet to everyone except self. // Broadcast the packet to everyone except self.
Game/Handlers/MovementHandler.cs
+11 -11
View File
@@ -58,7 +58,7 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.MoveDoubleJump, Processing = PacketProcessing.ThreadSafe)] [WorldPacketHandler(ClientOpcodes.MoveDoubleJump, Processing = PacketProcessing.ThreadSafe)]
void HandleMovement(ClientPlayerMovement packet) void HandleMovement(ClientPlayerMovement packet)
{ {
HandleMovementOpcode(packet.GetOpcode(), packet.movementInfo); HandleMovementOpcode(packet.GetOpcode(), packet.Status);
} }
void HandleMovementOpcode(ClientOpcodes opcode, MovementInfo movementInfo) void HandleMovementOpcode(ClientOpcodes opcode, MovementInfo movementInfo)
@@ -167,7 +167,7 @@ namespace Game
mover.UpdatePosition(movementInfo.Pos); mover.UpdatePosition(movementInfo.Pos);
MoveUpdate moveUpdate = new MoveUpdate(); MoveUpdate moveUpdate = new MoveUpdate();
moveUpdate.movementInfo = mover.m_movementInfo; moveUpdate.Status = mover.m_movementInfo;
mover.SendMessageToSet(moveUpdate, GetPlayer()); mover.SendMessageToSet(moveUpdate, GetPlayer());
if (plrMover) // nothing is charmed, or player charmed if (plrMover) // nothing is charmed, or player charmed
@@ -469,10 +469,10 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.MoveForceWalkSpeedChangeAck, Processing = PacketProcessing.ThreadSafe)] [WorldPacketHandler(ClientOpcodes.MoveForceWalkSpeedChangeAck, Processing = PacketProcessing.ThreadSafe)]
void HandleForceSpeedChangeAck(MovementSpeedAck packet) void HandleForceSpeedChangeAck(MovementSpeedAck packet)
{ {
GetPlayer().ValidateMovementInfo(packet.Ack.movementInfo); GetPlayer().ValidateMovementInfo(packet.Ack.Status);
// now can skip not our packet // now can skip not our packet
if (GetPlayer().GetGUID() != packet.Ack.movementInfo.Guid) if (GetPlayer().GetGUID() != packet.Ack.Status.Guid)
return; return;
/*----------------*/ /*----------------*/
@@ -554,15 +554,15 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.MoveKnockBackAck, Processing = PacketProcessing.ThreadSafe)] [WorldPacketHandler(ClientOpcodes.MoveKnockBackAck, Processing = PacketProcessing.ThreadSafe)]
void HandleMoveKnockBackAck(MoveKnockBackAck movementAck) 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; return;
GetPlayer().m_movementInfo = movementAck.Ack.movementInfo; GetPlayer().m_movementInfo = movementAck.Ack.Status;
MoveUpdateKnockBack updateKnockBack = new MoveUpdateKnockBack(); MoveUpdateKnockBack updateKnockBack = new MoveUpdateKnockBack();
updateKnockBack.movementInfo = GetPlayer().m_movementInfo; updateKnockBack.Status = GetPlayer().m_movementInfo;
GetPlayer().SendMessageToSet(updateKnockBack, false); GetPlayer().SendMessageToSet(updateKnockBack, false);
} }
@@ -580,7 +580,7 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.MoveEnableDoubleJumpAck, Processing = PacketProcessing.ThreadSafe)] [WorldPacketHandler(ClientOpcodes.MoveEnableDoubleJumpAck, Processing = PacketProcessing.ThreadSafe)]
void HandleMovementAckMessage(MovementAckMessage movementAck) void HandleMovementAckMessage(MovementAckMessage movementAck)
{ {
GetPlayer().ValidateMovementInfo(movementAck.Ack.movementInfo); GetPlayer().ValidateMovementInfo(movementAck.Ack.Status);
} }
[WorldPacketHandler(ClientOpcodes.SummonResponse)] [WorldPacketHandler(ClientOpcodes.SummonResponse)]
@@ -595,7 +595,7 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.MoveSetCollisionHeightAck, Processing = PacketProcessing.ThreadSafe)] [WorldPacketHandler(ClientOpcodes.MoveSetCollisionHeightAck, Processing = PacketProcessing.ThreadSafe)]
void HandleSetCollisionHeightAck(MoveSetCollisionHeightAck packet) void HandleSetCollisionHeightAck(MoveSetCollisionHeightAck packet)
{ {
GetPlayer().ValidateMovementInfo(packet.Data.movementInfo); GetPlayer().ValidateMovementInfo(packet.Data.Status);
} }
[WorldPacketHandler(ClientOpcodes.MoveTimeSkipped, Processing = PacketProcessing.Inplace)] [WorldPacketHandler(ClientOpcodes.MoveTimeSkipped, Processing = PacketProcessing.Inplace)]
@@ -606,7 +606,7 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.MoveSplineDone, Processing = PacketProcessing.ThreadSafe)] [WorldPacketHandler(ClientOpcodes.MoveSplineDone, Processing = PacketProcessing.ThreadSafe)]
void HandleMoveSplineDoneOpcode(MoveSplineDone moveSplineDone) void HandleMoveSplineDoneOpcode(MoveSplineDone moveSplineDone)
{ {
MovementInfo movementInfo = moveSplineDone.movementInfo; MovementInfo movementInfo = moveSplineDone.Status;
_player.ValidateMovementInfo(movementInfo); _player.ValidateMovementInfo(movementInfo);
// in taxi flight packet received in 2 case: // in taxi flight packet received in 2 case:
Game/Handlers/VehicleHandler.cs
+1 -1
View File
@@ -210,7 +210,7 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.MoveSetVehicleRecIdAck)] [WorldPacketHandler(ClientOpcodes.MoveSetVehicleRecIdAck)]
void HandleMoveSetVehicleRecAck(MoveSetVehicleRecIdAck setVehicleRecIdAck) void HandleMoveSetVehicleRecAck(MoveSetVehicleRecIdAck setVehicleRecIdAck)
{ {
GetPlayer().ValidateMovementInfo(setVehicleRecIdAck.Data.movementInfo); GetPlayer().ValidateMovementInfo(setVehicleRecIdAck.Data.Status);
} }
} }
} }
Game/Network/Packets/MovementPackets.cs
+16 -16
View File
@@ -268,10 +268,10 @@ namespace Game.Network.Packets
public override void Read() public override void Read()
{ {
movementInfo = MovementExtensions.ReadMovementInfo(_worldPacket); Status = MovementExtensions.ReadMovementInfo(_worldPacket);
} }
public MovementInfo movementInfo; public MovementInfo Status;
} }
public class MoveUpdate : ServerPacket public class MoveUpdate : ServerPacket
@@ -280,10 +280,10 @@ namespace Game.Network.Packets
public override void Write() public override void Write()
{ {
MovementExtensions.WriteMovementInfo(_worldPacket, movementInfo); MovementExtensions.WriteMovementInfo(_worldPacket, Status);
} }
public MovementInfo movementInfo; public MovementInfo Status;
} }
public class MonsterMove : ServerPacket public class MonsterMove : ServerPacket
@@ -417,11 +417,11 @@ namespace Game.Network.Packets
public override void Write() public override void Write()
{ {
MovementExtensions.WriteMovementInfo(_worldPacket, movementInfo); MovementExtensions.WriteMovementInfo(_worldPacket, Status);
_worldPacket.WriteFloat(Speed); _worldPacket.WriteFloat(Speed);
} }
public MovementInfo movementInfo; public MovementInfo Status;
public float Speed = 1.0f; public float Speed = 1.0f;
} }
@@ -574,7 +574,7 @@ namespace Game.Network.Packets
public override void Write() public override void Write()
{ {
MovementExtensions.WriteMovementInfo(_worldPacket, movementInfo); MovementExtensions.WriteMovementInfo(_worldPacket, Status);
_worldPacket.WriteInt32(MovementForces.Count); _worldPacket.WriteInt32(MovementForces.Count);
_worldPacket.WriteBit(WalkSpeed.HasValue); _worldPacket.WriteBit(WalkSpeed.HasValue);
@@ -619,7 +619,7 @@ namespace Game.Network.Packets
_worldPacket.WriteFloat(PitchRate.Value); _worldPacket.WriteFloat(PitchRate.Value);
} }
public MovementInfo movementInfo; public MovementInfo Status;
public List<MovementForce> MovementForces = new List<MovementForce>(); public List<MovementForce> MovementForces = new List<MovementForce>();
public Optional<float> SwimBackSpeed; public Optional<float> SwimBackSpeed;
public Optional<float> FlightSpeed; public Optional<float> FlightSpeed;
@@ -750,10 +750,10 @@ namespace Game.Network.Packets
public override void Write() public override void Write()
{ {
MovementExtensions.WriteMovementInfo(_worldPacket, movementInfo); MovementExtensions.WriteMovementInfo(_worldPacket, Status);
} }
public MovementInfo movementInfo; public MovementInfo Status;
} }
class MoveKnockBackAck : ClientPacket class MoveKnockBackAck : ClientPacket
@@ -805,12 +805,12 @@ namespace Game.Network.Packets
public override void Write() public override void Write()
{ {
MovementExtensions.WriteMovementInfo(_worldPacket, movementInfo); MovementExtensions.WriteMovementInfo(_worldPacket, Status);
_worldPacket.WriteFloat(Height); _worldPacket.WriteFloat(Height);
_worldPacket.WriteFloat(Scale); _worldPacket.WriteFloat(Scale);
} }
public MovementInfo movementInfo; public MovementInfo Status;
public float Scale = 1.0f; public float Scale = 1.0f;
public float Height = 1.0f; public float Height = 1.0f;
} }
@@ -882,11 +882,11 @@ namespace Game.Network.Packets
public override void Read() public override void Read()
{ {
movementInfo = MovementExtensions.ReadMovementInfo(_worldPacket); Status = MovementExtensions.ReadMovementInfo(_worldPacket);
SplineID = _worldPacket.ReadInt32(); SplineID = _worldPacket.ReadInt32();
} }
public MovementInfo movementInfo; public MovementInfo Status;
public int SplineID; public int SplineID;
} }
@@ -1226,11 +1226,11 @@ namespace Game.Network.Packets
{ {
public void Read(WorldPacket data) public void Read(WorldPacket data)
{ {
movementInfo = MovementExtensions.ReadMovementInfo(data); Status = MovementExtensions.ReadMovementInfo(data);
AckIndex = data.ReadInt32(); AckIndex = data.ReadInt32();
} }
public MovementInfo movementInfo; public MovementInfo Status;
public int AckIndex; public int AckIndex;
} }