[mr168] corrects to mr162

mangosR2 · Jun 8, 2011 · 4daa8d6 · 4daa8d6
1 parent b4c8f93
commit 4daa8d6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
@@ -7779,8 +7779,13 @@ bool Unit::IsImmuneToSpell(SpellEntry const* spellInfo)
         AuraList const& immuneAuraApply = GetAurasByType(SPELL_AURA_MECHANIC_IMMUNITY_MASK);
         for(AuraList::const_iterator iter = immuneAuraApply.begin(); iter != immuneAuraApply.end(); ++iter)
         {
-            if ((*iter)->GetId() == 46924 && mechanic == MECHANIC_DISARM)
-                continue;
+            if ((*iter)->GetId() == 46924)
+            {
+                if (mechanic == MECHANIC_DISARM)
+                    continue;
+                else if (mechanic & IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK)
+                    return true;
+            }
 
             if ((*iter)->GetModifier()->m_miscvalue & (1 << (mechanic-1)))
                 return true;
@@ -7814,7 +7819,7 @@ bool Unit::IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex i
             {
                 if (mechanic == MECHANIC_DISARM)
                     continue;
-                else if (spellInfo->EffectMechanic[index] & IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK ||
+                else if (mechanic & IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK ||
                     spellInfo->Mechanic & IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK)
                     return true;
             }

diff --git a/src/shared/revision_R2.h b/src/shared/revision_R2.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_R2_H__
 #define __REVISION_R2_H__
- #define REVISION_R2 "167"
+ #define REVISION_R2 "168"
 #endif // __REVISION_R2_H__