diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-28 19:24:01 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-28 19:24:01 +0200 |
| commit | 316663807862ad2a4a24edbe8c2e508715d02cdc (patch) | |
| tree | fb12194fcdd574f294b9ec05cef37efa87babd8a /src/server/scripts/Spells | |
| parent | 14d80d269dd7f9624983bc5a610e511f31ed33f0 (diff) | |
| parent | a9174617622a85599e8e2878f3036b35781192dd (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
Diffstat (limited to 'src/server/scripts/Spells')
| -rw-r--r-- | src/server/scripts/Spells/spell_warrior.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index c81d3aaae62..d80cab12c26 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -750,7 +750,7 @@ class spell_warr_second_wind_proc : public SpellScriptLoader { if (eventInfo.GetProcTarget() == GetTarget()) return false; - if (!(eventInfo.GetDamageInfo() || eventInfo.GetDamageInfo()->GetSpellInfo()->GetAllEffectsMechanicMask() & ((1 << MECHANIC_ROOT) | (1 << MECHANIC_STUN)))) + if (!eventInfo.GetDamageInfo()->GetSpellInfo() || !(eventInfo.GetDamageInfo()->GetSpellInfo()->GetAllEffectsMechanicMask() & ((1 << MECHANIC_ROOT) | (1 << MECHANIC_STUN)))) return false; return true; } |