aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQAston <qaston@gmail.com>2011-06-11 04:19:50 -0700
committerQAston <qaston@gmail.com>2011-06-11 04:19:50 -0700
commit5bbeccd00f2c94d7b1d74235744ef9e168cf989a (patch)
tree18dc1ed35d95afe630c87150f89620b3064be3c0 /src
parent34d980ea4c1555ff733ad4fd36791fde7e988d69 (diff)
parent94397e5b2e2598c6274a4fc35af14ab328bcc890 (diff)
Merge pull request #1921 from zwerg/master
Fix problem with removing immunities by Unit::ApplySpellImmune
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 8848294cb01..414791b73c6 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -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)