From 31802e138b6935d3bb087ffd81ab581902ce16bb Mon Sep 17 00:00:00 2001 From: Discover- Date: Sat, 22 Oct 2011 11:57:41 +0100 Subject: DB/SAI: Fix quest A Meeting With The Magister and An Audience With The Arcanist Closes #1092 Closes #2958 --- src/server/scripts/Northrend/dalaran.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Northrend/dalaran.cpp b/src/server/scripts/Northrend/dalaran.cpp index be9e9308f4f..8ff5a314dcc 100644 --- a/src/server/scripts/Northrend/dalaran.cpp +++ b/src/server/scripts/Northrend/dalaran.cpp @@ -70,8 +70,9 @@ public: return; Player* player = who->GetCharmerOrOwnerPlayerOrPlayerItself(); - - if (!player || player->isGameMaster() || player->IsBeingTeleported()) + + // If player has Disguise aura for quest A Meeting With The Magister or An Audience With The Arcanist, do not teleport it away but let it pass + if (!player || player->isGameMaster() || player->IsBeingTeleported() || player->HasAura(70973) || player->HasAura(70971)) return; switch (me->GetEntry()) -- cgit v1.2.3