From 13ea33bb442ed139ae4f2dda1c0198e39e1c9d5d Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Thu, 16 Nov 2023 16:34:27 +0100 Subject: Core/Packets: fixed SMSG_ON_MONSTER_MOVE packet structure --- src/server/game/Server/Packets/MovementPackets.cpp | 5 +---- src/server/game/Server/Packets/MovementPackets.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp index 49e7c7f9f92..8ac8e368d86 100644 --- a/src/server/game/Server/Packets/MovementPackets.cpp +++ b/src/server/game/Server/Packets/MovementPackets.cpp @@ -312,7 +312,6 @@ ByteBuffer& WorldPackets::operator<<(ByteBuffer& data, Movement::MovementSpline data.WriteBit(movementSpline.SpellEffectExtraData.has_value()); data.WriteBit(movementSpline.JumpExtraData.has_value()); data.WriteBit(movementSpline.AnimTierTransition.has_value()); - data.WriteBit(movementSpline.Unknown901.has_value()); data.FlushBits(); if (movementSpline.SplineFilter) @@ -347,15 +346,13 @@ ByteBuffer& WorldPackets::operator<<(ByteBuffer& data, Movement::MovementSpline if (movementSpline.AnimTierTransition) data << *movementSpline.AnimTierTransition; - if (movementSpline.Unknown901) - data << *movementSpline.Unknown901; - return data; } ByteBuffer& WorldPackets::operator<<(ByteBuffer& data, Movement::MovementMonsterSpline const& movementMonsterSpline) { data << movementMonsterSpline.ID; + data << movementMonsterSpline.Destination; data.WriteBit(movementMonsterSpline.CrzTeleport); data.WriteBits(movementMonsterSpline.StopDistanceTolerance, 3); diff --git a/src/server/game/Server/Packets/MovementPackets.h b/src/server/game/Server/Packets/MovementPackets.h index 77cc00d71c7..ca6bea303f0 100644 --- a/src/server/game/Server/Packets/MovementPackets.h +++ b/src/server/game/Server/Packets/MovementPackets.h @@ -130,7 +130,6 @@ namespace WorldPackets Optional SpellEffectExtraData; Optional JumpExtraData; Optional AnimTierTransition; - Optional Unknown901; float FaceDirection = 0.0f; ObjectGuid FaceGUID; TaggedPosition FaceSpot; @@ -139,6 +138,7 @@ namespace WorldPackets struct MovementMonsterSpline { uint32 ID = 0; + TaggedPosition Destination; bool CrzTeleport = false; uint8 StopDistanceTolerance = 0; // Determines how far from spline destination the mover is allowed to stop in place 0, 0, 3.0, 2.76, numeric_limits::max, 1.1, float(INT_MAX); default before this field existed was distance 3.0 (index 2) MovementSpline Move; -- cgit v1.2.3