Core: Update to 7.0.3.22210

3 files changed, 12 insertions, 9 deletions

diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp
index ff8337c88c4..35c14cf8ce3 100644
--- a/src/server/game/Server/Packets/MovementPackets.cpp
+++ b/src/server/game/Server/Packets/MovementPackets.cpp
@@ -226,17 +226,13 @@ ByteBuffer& WorldPackets::operator<<(ByteBuffer& data, Movement::MovementSpline
     data << uint32(movementSpline.MoveTime);
     data << float(movementSpline.JumpGravity);
     data << uint32(movementSpline.SpecialTime);
-    data << uint32(movementSpline.Points.size());
     data << uint8(movementSpline.Mode);
     data << uint8(movementSpline.VehicleExitVoluntary);
     data << movementSpline.TransportGUID;
     data << int8(movementSpline.VehicleSeat);
-    data << uint32(movementSpline.PackedDeltas.size());
-    for (G3D::Vector3 const& pos : movementSpline.Points)
-        data << pos;
-    for (G3D::Vector3 const& pos : movementSpline.PackedDeltas)
-        data.appendPackXYZ(pos.x, pos.y, pos.z);
     data.WriteBits(movementSpline.Face, 2);
+    data.WriteBits(movementSpline.Points.size(), 16);
+    data.WriteBits(movementSpline.PackedDeltas.size(), 16);
     data.WriteBit(movementSpline.SplineFilter.is_initialized());
     data.WriteBit(movementSpline.SpellEffectExtraData.is_initialized());
     data.FlushBits();
@@ -258,6 +254,11 @@ ByteBuffer& WorldPackets::operator<<(ByteBuffer& data, Movement::MovementSpline
             break;
     }
 
+    for (G3D::Vector3 const& pos : movementSpline.Points)
+        data << pos;
+    for (G3D::Vector3 const& pos : movementSpline.PackedDeltas)
+        data.appendPackXYZ(pos.x, pos.y, pos.z);
+
     if (movementSpline.SpellEffectExtraData)
         data << *movementSpline.SpellEffectExtraData;
 
@@ -297,12 +298,10 @@ void WorldPackets::Movement::CommonMovement::WriteCreateObjectSplineDataBlock(::
         data << uint32(moveSpline.Duration());                                  // Duration
         data << float(1.0f);                                                    // DurationModifier
         data << float(1.0f);                                                    // NextDurationModifier
-        data << uint32(moveSpline.getPath().size());
-        data.append<G3D::Vector3>(&moveSpline.getPath()[0], moveSpline.getPath().size());
-
         data.WriteBits(moveSpline.facing.type, 2);                              // Face
         bool HasJumpGravity = data.WriteBit(moveSpline.splineflags & (::Movement::MoveSplineFlag::Parabolic | ::Movement::MoveSplineFlag::Animation));                 // HasJumpGravity
         bool HasSpecialTime = data.WriteBit((moveSpline.splineflags & ::Movement::MoveSplineFlag::Parabolic) && moveSpline.effect_start_time < moveSpline.Duration()); // HasSpecialTime
+        data.WriteBits(moveSpline.getPath().size(), 16);
         data.WriteBits(uint8(moveSpline.spline.mode()), 2);                     // Mode
         data.WriteBit(0);                                                       // HasSplineFilter
         data.WriteBit(0);                                                       // HasSpellEffectExtraData
@@ -340,6 +339,8 @@ void WorldPackets::Movement::CommonMovement::WriteCreateObjectSplineDataBlock(::
         if (HasSpecialTime)
             data << uint32(moveSpline.effect_start_time);                       // SpecialTime
 
+        data.append<G3D::Vector3>(&moveSpline.getPath()[0], moveSpline.getPath().size());
+
         //if (HasSpellEffectExtraData)
         //{
         //    data << ObjectGuid();
diff --git a/src/server/game/Server/Packets/QuestPackets.cpp b/src/server/game/Server/Packets/QuestPackets.cpp
index 04ce0bcd570..4f2139c3454 100644
--- a/src/server/game/Server/Packets/QuestPackets.cpp
+++ b/src/server/game/Server/Packets/QuestPackets.cpp
@@ -430,6 +430,7 @@ WorldPacket const* WorldPackets::Quest::QuestGiverRequestItems::Write()
 
     _worldPacket.WriteBit(AutoLaunched);
     _worldPacket.WriteBit(CanIgnoreQuest);
+    _worldPacket.WriteBit(IsQuestIgnored);
     _worldPacket.FlushBits();
 
     _worldPacket.WriteBits(QuestTitle.size(), 9);
diff --git a/src/server/game/Server/Packets/QuestPackets.h b/src/server/game/Server/Packets/QuestPackets.h
index 173ba7bb060..170c3d992fb 100644
--- a/src/server/game/Server/Packets/QuestPackets.h
+++ b/src/server/game/Server/Packets/QuestPackets.h
@@ -403,6 +403,7 @@ namespace WorldPackets
             std::string QuestTitle;
             std::string CompletionText;
             bool CanIgnoreQuest         = false;
+            bool IsQuestIgnored         = false;
         };
 
         class QuestGiverRequestReward final : public ClientPacket