diff options
author | Discover- <amort11@hotmail.com> | 2011-10-22 11:57:41 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2011-10-22 11:57:41 +0100 |
commit | 31802e138b6935d3bb087ffd81ab581902ce16bb (patch) | |
tree | 6be1c34c17ba4777e87a03d07be5a4673722ded7 /src | |
parent | 8c105bd256b8ad5adb23d0a51336770fce28bdc7 (diff) |
DB/SAI: Fix quest A Meeting With The Magister and An Audience With The Arcanist
Closes #1092
Closes #2958
Diffstat (limited to 'src')
-rw-r--r-- | src/server/scripts/Northrend/dalaran.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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()) |