diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-12-23 13:24:59 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-12-23 13:24:59 -0500 |
| commit | 7a2c81bfd01663f636871ebbb2c2e71cf241af73 (patch) | |
| tree | 3b2cb4cfe673f838f98f596bec8ce609b4d6b1e0 /src/server/game/Spells/Spell.cpp | |
| parent | 6ff69a10b3bc443ab17d2c803f24ffea8c2bdbb8 (diff) | |
| parent | c33a1724ae96de3759d299038b1eabd7b93a631f (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 364127a55ba..25dcd0c43ba 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5656,7 +5656,7 @@ SpellCastResult Spell::CheckCasterAuras() const Unit::AuraEffectList const& stunAuras = m_caster->GetAuraEffectsByType(SPELL_AURA_MOD_STUN); for (Unit::AuraEffectList::const_iterator i = stunAuras.begin(); i != stunAuras.end(); ++i) { - if (!((*i)->GetSpellInfo()->GetAllEffectsMechanicMask() & (1<<MECHANIC_STUN))) + if ((*i)->GetSpellInfo()->GetAllEffectsMechanicMask() && !((*i)->GetSpellInfo()->GetAllEffectsMechanicMask() & (1<<MECHANIC_STUN))) { foundNotStun = true; break; |