From da3783876b141f716d5daf09f9d69d8248a8382a Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 21 Jan 2017 13:16:06 +0100 Subject: [PATCH] Core/Player: Removed unneeded distance check from Player::ActivateTaxiPathTo, it is already checked by HandleActivateTaxi* methods (and taxis started serverside should not have such requirements) Closes #15398 (cherry-picked from 998efa55d8c81b923bb0725b5de8b0c5894b89da) --- src/server/game/Entities/Player/Player.cpp | 15 --------------- src/server/game/Handlers/TaxiHandler.cpp | 1 + 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index f920d3762c2..01d6b9e2066 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -22143,21 +22143,6 @@ bool Player::ActivateTaxiPathTo(std::vector const& nodes, Creature* npc return false; } - // check node starting pos data set case if provided - if (node->Pos.X != 0.0f || node->Pos.Y != 0.0f || node->Pos.Z != 0.0f) - { - if (node->ContinentID != GetMapId() || !IsInDist(node->Pos.X, node->Pos.Y, node->Pos.Z, 2 * INTERACTION_DISTANCE)) - { - GetSession()->SendActivateTaxiReply(ERR_TAXITOOFARAWAY); - return false; - } - } - // node must have pos if taxi master case (npc != NULL) - else if (npc) - { - GetSession()->SendActivateTaxiReply(ERR_TAXIUNSPECIFIEDSERVERERROR); - return false; - } // Prepare to flight start now // stop combat at start taxi flight if any diff --git a/src/server/game/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp index 5b08ed6bdb2..abb05a2a0c9 100644 --- a/src/server/game/Handlers/TaxiHandler.cpp +++ b/src/server/game/Handlers/TaxiHandler.cpp @@ -162,6 +162,7 @@ void WorldSession::HandleActivateTaxiOpcode(WorldPackets::Taxi::ActivateTaxi& ac if (!unit) { TC_LOG_DEBUG("network", "WORLD: HandleActivateTaxiOpcode - %s not found or you can't interact with it.", activateTaxi.Vendor.ToString().c_str()); + SendActivateTaxiReply(ERR_TAXITOOFARAWAY); return; }