4 files changed, 15 insertions, 6 deletions
diff --git a/src/server/game/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp
index 59dd291a7a1..c807e2cb4ed 100644
--- a/src/server/game/Handlers/TaxiHandler.cpp
+++ b/src/server/game/Handlers/TaxiHandler.cpp
@@ -133,7 +133,7 @@ bool WorldSession::SendLearnNewTaxiNode(Creature* unit)
 
     if (GetPlayer()->m_taxi.SetTaximaskNode(curloc))
     {
-        SendPacket(WorldPackets::Taxi::NewTaxiPath().Write());
+        SendPacket(WorldPackets::Taxi::NewTaxiPath(curloc).Write());
 
         WorldPackets::Taxi::TaxiNodeStatus data;
         data.Unit = unit->GetGUID();
@@ -150,7 +150,7 @@ bool WorldSession::SendLearnNewTaxiNode(Creature* unit)
 void WorldSession::SendDiscoverNewTaxiNode(uint32 nodeid)
 {
     if (GetPlayer()->m_taxi.SetTaximaskNode(nodeid))
-        SendPacket(WorldPackets::Taxi::NewTaxiPath().Write());
+        SendPacket(WorldPackets::Taxi::NewTaxiPath(nodeid).Write());
 }
 
 void WorldSession::HandleActivateTaxiOpcode(WorldPackets::Taxi::ActivateTaxi& activateTaxi)
diff --git a/src/server/game/Server/Packets/QuestPackets.cpp b/src/server/game/Server/Packets/QuestPackets.cpp
index 7f4c8a06f3e..3bafa6856f0 100644
--- a/src/server/game/Server/Packets/QuestPackets.cpp
+++ b/src/server/game/Server/Packets/QuestPackets.cpp
@@ -368,11 +368,11 @@ ByteBuffer& operator<<(ByteBuffer& data, QuestGiverOfferReward const& offer)
     data << offer.Rewards; // QuestRewards
     data << int32(offer.Emotes.size());
     data << offer.QuestGiverGUID;
-    data << int32(offer.QuestGiverCreatureID);
-    data << int32(offer.QuestID);
     data << int32(offer.QuestFlags[0]); // Flags
     data << int32(offer.QuestFlags[1]); // FlagsEx
     data << int32(offer.QuestFlags[2]); // FlagsEx2
+    data << int32(offer.QuestGiverCreatureID);
+    data << int32(offer.QuestID);
     data << int32(offer.SuggestedPartyMembers);
     data << int32(offer.QuestInfoID);
     for (QuestDescEmote const& emote : offer.Emotes)
diff --git a/src/server/game/Server/Packets/TaxiPackets.cpp b/src/server/game/Server/Packets/TaxiPackets.cpp
index 3fe652aa590..f11519b5c9c 100644
--- a/src/server/game/Server/Packets/TaxiPackets.cpp
+++ b/src/server/game/Server/Packets/TaxiPackets.cpp
@@ -69,6 +69,13 @@ void WorldPackets::Taxi::ActivateTaxi::Read()
     _worldPacket >> FlyingMountID;
 }
 
+WorldPacket const* WorldPackets::Taxi::NewTaxiPath::Write()
+{
+    _worldPacket << int32(TaxiNodesID);
+
+    return &_worldPacket;
+}
+
 WorldPacket const* WorldPackets::Taxi::ActivateTaxiReply::Write()
 {
     _worldPacket.WriteBits(Reply, 4);
diff --git a/src/server/game/Server/Packets/TaxiPackets.h b/src/server/game/Server/Packets/TaxiPackets.h
index ddeb7920d3d..0f80a7b2020 100644
--- a/src/server/game/Server/Packets/TaxiPackets.h
+++ b/src/server/game/Server/Packets/TaxiPackets.h
@@ -102,9 +102,11 @@ namespace WorldPackets
         class NewTaxiPath final : public ServerPacket
         {
         public:
-            NewTaxiPath() : ServerPacket(SMSG_NEW_TAXI_PATH, 0) { }
+            explicit NewTaxiPath(int32 taxiNodesId) : ServerPacket(SMSG_NEW_TAXI_PATH, 4), TaxiNodesID(taxiNodesId) { }
 
-            WorldPacket const* Write() override { return &_worldPacket; }
+            WorldPacket const* Write() override;
+
+            int32 TaxiNodesID = 0;
         };
 
         class ActivateTaxiReply final : public ServerPacket