diff options
| -rw-r--r-- | src/game/BattleGroundHandler.cpp | 2 | ||||
| -rw-r--r-- | src/game/Level2.cpp | 10 | ||||
| -rw-r--r-- | src/game/MovementHandler.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp index a9ba41c682f..4a97ca0d0f7 100644 --- a/src/game/BattleGroundHandler.cpp +++ b/src/game/BattleGroundHandler.cpp @@ -399,7 +399,7 @@ void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data ) if (_player->isInFlight()) { _player->GetMotionMaster()->MovementExpired(); - _player->m_taxi.ClearTaxiDestinations(); + _player->CleanupAfterTaxiFlight(); } sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_IN_PROGRESS, 0, bg->GetStartTime(), bg->GetArenaType()); diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index 74a3b5b935e..5e43c29d1bd 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -172,7 +172,7 @@ bool ChatHandler::HandleGoTicketCommand(const char * args) if(_player->isInFlight()) { _player->GetMotionMaster()->MovementExpired(); - _player->m_taxi.ClearTaxiDestinations(); + _player->CleanupAfterTaxiFlight(); } else _player->SaveRecallPosition(); @@ -216,7 +216,7 @@ bool ChatHandler::HandleGoTriggerCommand(const char* args) if(_player->isInFlight()) { _player->GetMotionMaster()->MovementExpired(); - _player->m_taxi.ClearTaxiDestinations(); + _player->CleanupAfterTaxiFlight(); } // save only in non-flight case else @@ -261,7 +261,7 @@ bool ChatHandler::HandleGoGraveyardCommand(const char* args) if(_player->isInFlight()) { _player->GetMotionMaster()->MovementExpired(); - _player->m_taxi.ClearTaxiDestinations(); + _player->CleanupAfterTaxiFlight(); } // save only in non-flight case else @@ -364,7 +364,7 @@ bool ChatHandler::HandleGoCreatureCommand(const char* args) if(_player->isInFlight()) { _player->GetMotionMaster()->MovementExpired(); - _player->m_taxi.ClearTaxiDestinations(); + _player->CleanupAfterTaxiFlight(); } // save only in non-flight case else @@ -421,7 +421,7 @@ bool ChatHandler::HandleGoObjectCommand(const char* args) if(_player->isInFlight()) { _player->GetMotionMaster()->MovementExpired(); - _player->m_taxi.ClearTaxiDestinations(); + _player->CleanupAfterTaxiFlight(); } // save only in non-flight case else diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp index 7b1553c9564..522b35219db 100644 --- a/src/game/MovementHandler.cpp +++ b/src/game/MovementHandler.cpp @@ -135,7 +135,7 @@ void WorldSession::HandleMoveWorldportAckOpcode() // battleground state prepare, stop flight GetPlayer()->GetMotionMaster()->MovementExpired(); - GetPlayer()->m_taxi.ClearTaxiDestinations(); + GetPlayer()->CleanupAfterTaxiFlight(); } // resurrect character at enter into instance where his corpse exist after add to map |