diff options
| author | Kandera <KanderaDev@gmail.com> | 2012-02-21 11:33:49 -0500 |
|---|---|---|
| committer | Kandera <KanderaDev@gmail.com> | 2012-08-20 13:34:04 -0400 |
| commit | 16f2c3a48e4909aab000a89fd4b4ced4a8bae43c (patch) | |
| tree | 4880d2abcb673a0d5b75bb59efecbb08292068c1 /src/server/game/Spells/SpellMgr.cpp | |
| parent | c28a8aafc0cd0f2b8bd6aa4c5106eb52a4b768b2 (diff) | |
merge master into wintergrasp and fix build errors. yay me!
Diffstat (limited to 'src/server/game/Spells/SpellMgr.cpp')
| -rwxr-xr-x | src/server/game/Spells/SpellMgr.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index c26e78f3418..93bb15d844b 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1120,6 +1120,16 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 return false; break; } + case 58730: // No fly Zone - Wintergrasp + { + if (!player) + return false; + + Battlefield* Bf = sBattlefieldMgr.GetBattlefieldToZoneId(player->GetZoneId()); + if (!Bf || Bf->CanFlyIn() || (!player->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) && !player->HasAuraType(SPELL_AURA_FLY))) + return false; + break; + } case 68719: // Oil Refinery - Isle of Conquest. case 68720: // Quarry - Isle of Conquest. { |