diff --git a/Source/Game/Handlers/TaxiHandler.cs b/Source/Game/Handlers/TaxiHandler.cs index 369bff8ce..ffb2a0603 100644 --- a/Source/Game/Handlers/TaxiHandler.cs +++ b/Source/Game/Handlers/TaxiHandler.cs @@ -122,7 +122,7 @@ namespace Game if (GetPlayer().m_taxi.SetTaximaskNode(curloc)) { - SendPacket(new NewTaxiPath()); + SendPacket(new NewTaxiPath(curloc)); TaxiNodeStatusPkt data = new(); data.Unit = unit.GetGUID(); @@ -139,7 +139,7 @@ namespace Game public void SendDiscoverNewTaxiNode(uint nodeid) { if (GetPlayer().m_taxi.SetTaximaskNode(nodeid)) - SendPacket(new NewTaxiPath()); + SendPacket(new NewTaxiPath(nodeid)); } [WorldPacketHandler(ClientOpcodes.ActivateTaxi, Processing = PacketProcessing.ThreadSafe)] diff --git a/Source/Game/Networking/Packets/QuestPackets.cs b/Source/Game/Networking/Packets/QuestPackets.cs index e20f94792..810f19916 100644 --- a/Source/Game/Networking/Packets/QuestPackets.cs +++ b/Source/Game/Networking/Packets/QuestPackets.cs @@ -1258,11 +1258,11 @@ namespace Game.Networking.Packets Rewards.Write(data); // QuestRewards data.WriteInt32(Emotes.Count); data.WritePackedGuid(QuestGiverGUID); - data.WriteUInt32(QuestGiverCreatureID); - data.WriteUInt32(QuestID); data.WriteUInt32(QuestFlags[0]); // Flags data.WriteUInt32(QuestFlags[1]); // FlagsEx data.WriteUInt32(QuestFlags[2]); // FlagsEx2 + data.WriteUInt32(QuestGiverCreatureID); + data.WriteUInt32(QuestID); data.WriteUInt32(SuggestedPartyMembers); data.WriteInt32(QuestInfoID); diff --git a/Source/Game/Networking/Packets/TaxiPackets.cs b/Source/Game/Networking/Packets/TaxiPackets.cs index 75ebb764b..956197a23 100644 --- a/Source/Game/Networking/Packets/TaxiPackets.cs +++ b/Source/Game/Networking/Packets/TaxiPackets.cs @@ -25,7 +25,7 @@ namespace Game.Networking.Packets public override void Write() { - _worldPacket .WritePackedGuid( Unit); + _worldPacket.WritePackedGuid(Unit); _worldPacket.WriteBits(Status, 2); _worldPacket.FlushBits(); } @@ -108,9 +108,17 @@ namespace Game.Networking.Packets class NewTaxiPath : ServerPacket { - public NewTaxiPath() : base(ServerOpcodes.NewTaxiPath) { } + uint TaxiNodesID; - public override void Write() { } + public NewTaxiPath(uint taxiNodesId) : base(ServerOpcodes.NewTaxiPath) + { + TaxiNodesID = taxiNodesId; + } + + public override void Write() + { + _worldPacket.WriteUInt32(TaxiNodesID); + } } class ActivateTaxiReplyPkt : ServerPacket