diff options
| author | kandera <kanderacutie@hotmail.com> | 2012-05-22 05:55:27 -0700 |
|---|---|---|
| committer | kandera <kanderacutie@hotmail.com> | 2012-05-22 05:55:27 -0700 |
| commit | fcfe552acdbba1ad6505e6e3d98a312a2c839ded (patch) | |
| tree | caadc3598bd8b66d2fdacbd030a4236e0bc4fc72 | |
| parent | 38ad9be96b2d60325314ae5c78188bd193c5a2df (diff) | |
| parent | 881138553b1a85fda62cc131dc6487195e49a2d1 (diff) | |
Merge pull request #6548 from Elron103/pull-requests
Core/Spells: Fix immunity checking for creatures (i.e. Mind Control)
| -rwxr-xr-x | src/server/game/Entities/Creature/Creature.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index d120713636d..6506a113ae1 100755 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1668,8 +1668,8 @@ bool Creature::IsImmunedToSpell(SpellInfo const* spellInfo) if (!spellInfo) return false; - // Spells that don't have effectMechanics. - if (!spellInfo->HasAnyEffectMechanic() && GetCreatureTemplate()->MechanicImmuneMask & (1 << (spellInfo->Mechanic - 1))) + // Creature is immune to main mechanic of the spell + if (GetCreatureTemplate()->MechanicImmuneMask & (1 << (spellInfo->Mechanic - 1))) return true; // This check must be done instead of 'if (GetCreatureTemplate()->MechanicImmuneMask & (1 << (spellInfo->Mechanic - 1)))' for not break |