Merge pull request #1921 from zwerg/master

Fix problem with removing immunities by Unit::ApplySpellImmune
2011-06-11 04:19:50 -07:00
parent 34d980ea4c 94397e5b2e
commit 5bbeccd00f
1 changed files with 1 additions and 2 deletions
@@ -11892,14 +11892,13 @@ void Unit::ApplySpellImmune(uint32 spellId, uint32 op, uint32 type, bool apply)
    {
        for (SpellImmuneList::iterator itr = m_spellImmune[op].begin(); itr != m_spellImmune[op].end(); ++itr)
        {
-            if (itr->spellId == spellId)
+            if (itr->spellId == spellId && itr->type == type)
            {
                m_spellImmune[op].erase(itr);
                break;
            }
        }
    }
-
 }

 void Unit::ApplySpellDispelImmunity(const SpellEntry * spellProto, DispelType type, bool apply)