[10210] Do unmount at expire restricted flight zone debuf if still in…

… restricted zone/etc.
mangos · Jul 17, 2010 · 42f7acb · technoir42 · Jul 17, 2010 · VladimirMangos
1 parent f18ddaf
commit 42f7acb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
@@ -2169,10 +2169,17 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
             }
             case 58600:                                     // Restricted Flight Area
             {
-                // Remove Flight Auras
-                target->CastSpell(target, 58601, true);
-                // Parachute
-                target->CastSpell(target, 45472, true);
+                AreaTableEntry const* area = GetAreaEntryByAreaID(target->GetAreaId());
+
+                // Dalaran restricted flight zone (recheck before apply unmount)
+                if (area && target->GetTargetGUID() == TYPEID_PLAYER && (area->flags & AREA_FLAG_CANNOT_FLY) &&
+                    ((Player*)target)->IsFreeFlying() && !((Player*)target)->isGameMaster())
+                {
+                    // Remove Flight Auras
+                    target->CastSpell(target, 58601, true);
+                    // Parachute
+                    target->CastSpell(target, 45472, true);
+                }
                 return;
             }
         }

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10209"
+ #define REVISION_NR "10210"
 #endif // __REVISION_NR_H__