diff options
| author | Wyrserth <43747507+Wyrserth@users.noreply.github.com> | 2019-06-06 11:40:53 +0200 |
|---|---|---|
| committer | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-06-06 11:40:53 +0200 |
| commit | 5016f588d5f20ef8eb0f3da9c3c92bbac8e132ee (patch) | |
| tree | 85dae8365d35b15d82428ec56c8a033cd5111f5d | |
| parent | 7918914d2b8064a93b91a6b0a0de33092897ad07 (diff) | |
Script/Dalaran: don't allow Dalaran faction guards to teleport a player that has the Trespasser! debuff. (#23373)
| -rw-r--r-- | src/server/scripts/Northrend/zone_dalaran.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index 199e3e23eca..0d33fea7553 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -89,7 +89,9 @@ public: 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 player->HasAura(SPELL_SUNREAVER_DISGUISE_FEMALE) || player->HasAura(SPELL_SUNREAVER_DISGUISE_MALE) || - player->HasAura(SPELL_SILVER_COVENANT_DISGUISE_FEMALE) || player->HasAura(SPELL_SILVER_COVENANT_DISGUISE_MALE)) + player->HasAura(SPELL_SILVER_COVENANT_DISGUISE_FEMALE) || player->HasAura(SPELL_SILVER_COVENANT_DISGUISE_MALE) || + // If player has already been teleported, don't try to teleport again + player->HasAura(SPELL_TRESPASSER_A) || player->HasAura(SPELL_TRESPASSER_H)) return; switch (me->GetEntry()) |