aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <runningnak3d@gmail.com>2010-01-20 15:04:47 -0700
committerBrian <runningnak3d@gmail.com>2010-01-20 15:04:47 -0700
commitda263cd1c49e8383407c9d708c6593aeb0eb9e4d (patch)
tree153cc362840dfb757e1c5d9f3b98eff9374724a9
parentc82599ebb99d0ffdcd76d90240990dfeae1e8065 (diff)
* Restore Dalaran no fly zone lost in last commit
--HG-- branch : trunk
-rw-r--r--src/game/SpellMgr.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index d4c5c80cbce..d21e4a6356b 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2993,7 +2993,14 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
if (auraSpell) // not have expected aura
if (!player || auraSpell > 0 && !player->HasAura(auraSpell) || auraSpell < 0 && player->HasAura(-auraSpell))
return false;
-
+ // Extra conditions -- leaving the possibility add extra conditions...
+ switch(spellId)
+ {
+ case SPELL_RESTRICTED_FLIGHT_AREA_58600: // No fly Zone - Dalaran (Krasus Landing exception)
+ if (!player || player->GetAreaId() == 4564 || !player->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) && !player->HasAuraType(SPELL_AURA_FLY) || player->HasAura(44795))
+ return false;
+ break;
+ }
}
//-----------TRINITY-------------