From 9a8db98c94e72ea80393072f2443f15478970af8 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 2 Sep 2018 22:28:44 +0200 Subject: [PATCH] build fix --- src/server/scripts/Commands/cs_go.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index 1d3de58c9a..b96dafb90f 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -662,12 +662,15 @@ public: Player* player = handler->GetSession()->GetPlayer(); if (player->IsInFlight()) - player->FinishTaxiFlight(); + { + player->GetMotionMaster()->MovementExpired(); + player->CleanupAfterTaxiFlight(); + } else player->SaveRecallPosition(); // try going to entrance - AreaTrigger const* exit = sObjectMgr->GetGoBackTrigger(mapid); + AreaTriggerStruct const* exit = sObjectMgr->GetGoBackTrigger(mapid); if (!exit) handler->PSendSysMessage(LANG_COMMAND_INSTANCE_NO_EXIT, mapid, scriptname); @@ -678,7 +681,7 @@ public: } // try going to start - AreaTrigger const* entrance = sObjectMgr->GetMapEntranceTrigger(mapid); + AreaTriggerStruct const* entrance = sObjectMgr->GetMapEntranceTrigger(mapid); if (!entrance) handler->PSendSysMessage(LANG_COMMAND_INSTANCE_NO_ENTRANCE, mapid, scriptname);