Rebase resync

This commit is contained in:
Antz 2020-02-17 09:19:44 +00:00
parent a0797532e8
commit 1997c1e903
3106 changed files with 11118 additions and 627576 deletions

View file

@ -1,4 +1,4 @@
/*
/**
* This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
*
* This program is free software; you can redistribute it and/or modify
@ -30,7 +30,7 @@
void WorldSession::HandleTaxiNodeStatusQueryOpcode(WorldPacket& recv_data)
{
DEBUG_LOG("WORLD: Received CMSG_TAXINODE_STATUS_QUERY");
DEBUG_LOG("WORLD: Received opcode CMSG_TAXINODE_STATUS_QUERY");
ObjectGuid guid;
@ -66,7 +66,7 @@ void WorldSession::SendTaxiStatus(ObjectGuid guid)
void WorldSession::HandleTaxiQueryAvailableNodes(WorldPacket& recv_data)
{
DEBUG_LOG("WORLD: Received CMSG_TAXIQUERYAVAILABLENODES");
DEBUG_LOG("WORLD: Received opcode CMSG_TAXIQUERYAVAILABLENODES");
ObjectGuid guid;
recv_data >> guid;
@ -161,7 +161,7 @@ void WorldSession::SendActivateTaxiReply(ActivateTaxiReply reply)
void WorldSession::HandleActivateTaxiExpressOpcode(WorldPacket& recv_data)
{
DEBUG_LOG("WORLD: Received CMSG_ACTIVATETAXIEXPRESS");
DEBUG_LOG("WORLD: Received opcode CMSG_ACTIVATETAXIEXPRESS");
ObjectGuid guid;
uint32 node_count;
@ -186,14 +186,14 @@ void WorldSession::HandleActivateTaxiExpressOpcode(WorldPacket& recv_data)
if (nodes.empty())
return;
DEBUG_LOG("WORLD: Received CMSG_ACTIVATETAXIEXPRESS from %d to %d" , nodes.front(), nodes.back());
DEBUG_LOG("WORLD: Received opcode CMSG_ACTIVATETAXIEXPRESS from %d to %d" , nodes.front(), nodes.back());
GetPlayer()->ActivateTaxiPathTo(nodes, npc);
}
void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& recv_data)
{
DEBUG_LOG("WORLD: Received CMSG_MOVE_SPLINE_DONE");
DEBUG_LOG("WORLD: Received opcode CMSG_MOVE_SPLINE_DONE");
MovementInfo movementInfo; // used only for proper packet read
recv_data >> movementInfo;
@ -261,14 +261,14 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& recv_data)
void WorldSession::HandleActivateTaxiOpcode(WorldPacket& recv_data)
{
DEBUG_LOG("WORLD: Received CMSG_ACTIVATETAXI");
DEBUG_LOG("WORLD: Received opcode CMSG_ACTIVATETAXI");
ObjectGuid guid;
std::vector<uint32> nodes;
nodes.resize(2);
recv_data >> guid >> nodes[0] >> nodes[1];
DEBUG_LOG("WORLD: Received CMSG_ACTIVATETAXI from %d to %d" , nodes[0], nodes[1]);
DEBUG_LOG("WORLD: Received opcode CMSG_ACTIVATETAXI from %d to %d" , nodes[0], nodes[1]);
Creature* npc = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_FLIGHTMASTER);
if (!npc)
{