diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-10-25 05:56:01 -0700 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-10-25 05:56:01 -0700 |
| commit | 69a81836ab98a64f4c683edc7fe4d225bd006b28 (patch) | |
| tree | 490187a4d2adec7d9b4518fc1e0b54427d4f708b /src/server/scripts | |
| parent | 3120364aff2fa0bd2962fffc130aef74ab7902c5 (diff) | |
| parent | 5ba72428e0384b2491866194b62cb708fbfe7d99 (diff) | |
Merge pull request #8174 from tibbi/sota
correcting SotA teleports + cleanup
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Northrend/wintergrasp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/scripts/Northrend/wintergrasp.cpp b/src/server/scripts/Northrend/wintergrasp.cpp index 2aed813550d..d4a3f83ab70 100644 --- a/src/server/scripts/Northrend/wintergrasp.cpp +++ b/src/server/scripts/Northrend/wintergrasp.cpp @@ -559,7 +559,8 @@ public: { if (Battlefield* wg = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG)) if (Player* target = GetExplTargetUnit()->ToPlayer()) - if (target->GetTeamId() != wg->GetDefenderTeam() || target->HasAura(SPELL_WINTERGRASP_TELEPORT_TRIGGER)) + // check if we are in Wintergrasp at all, SotA uses same teleport spells + if ((target->GetZoneId() == 4197) && target->GetTeamId() != wg->GetDefenderTeam() || target->HasAura(SPELL_WINTERGRASP_TELEPORT_TRIGGER)) return SPELL_FAILED_BAD_TARGETS; return SPELL_CAST_OK; } |