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
This commit is contained in:
1 parent
1cf9bdd6c7
commit
5ac6ed25d1
2 files changed
+2
-16
No files matched your search
@@ -21574,22 +21574,6 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
|
||||
return false;
|
||||
}
|
||||
|
||||
// check node starting pos data set case if provided
|
||||
if (node->x != 0.0f || node->y != 0.0f || node->z != 0.0f)
|
||||
{
|
||||
if (node->map_id != GetMapId() || !IsInDist(node->x, node->y, node->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
|
||||
|
||||
@@ -174,6 +174,7 @@ void WorldSession::HandleActivateTaxiExpressOpcode (WorldPacket& recvData)
|
||||
if (!npc)
|
||||
{
|
||||
TC_LOG_DEBUG("network", "WORLD: HandleActivateTaxiExpressOpcode - %s not found or you can't interact with it.", guid.ToString().c_str());
|
||||
SendActivateTaxiReply(ERR_TAXITOOFARAWAY);
|
||||
return;
|
||||
}
|
||||
std::vector<uint32> nodes;
|
||||
@@ -263,6 +264,7 @@ void WorldSession::HandleActivateTaxiOpcode(WorldPacket& recvData)
|
||||
if (!npc)
|
||||
{
|
||||
TC_LOG_DEBUG("network", "WORLD: HandleActivateTaxiOpcode - %s not found or you can't interact with it.", guid.ToString().c_str());
|
||||
SendActivateTaxiReply(ERR_TAXITOOFARAWAY);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user