diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-06-05 14:07:48 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-06-05 14:07:48 +0200 |
| commit | 22b04d39bf64e1dc19657128a7a31b1f3df7fb26 (patch) | |
| tree | 328704d8cce993d1c2dfdc78443e7df715e96878 /src | |
| parent | 5bb86ca7db9f108c0f3dc5650716e1a0ad472394 (diff) | |
| parent | afb7c705c208399ad5c31e55c88fac20c865d890 (diff) | |
Merge pull request #12220 from Trisjdc/spelll_triggerflag_check
Core/Spells: *Properly* solve the Disarm vs Bladestorm issue
Diffstat (limited to 'src')
| -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 efdc3ca532f..f5d90bc3612 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -567,7 +567,7 @@ m_caster((info->AttributesEx6 & SPELL_ATTR6_CAST_BY_CHARMER && caster->GetCharme m_spellState = SPELL_STATE_NULL; _triggeredCastFlags = triggerFlags; if (info->AttributesEx4 & SPELL_ATTR4_TRIGGERED) - _triggeredCastFlags = TRIGGERED_FULL_MASK; + _triggeredCastFlags = TriggerCastFlags(TRIGGERED_FULL_MASK & ~TRIGGERED_IGNORE_EQUIPPED_ITEM_REQUIREMENT); m_CastItem = NULL; m_castItemGUID = 0; |