diff options
| author | Michael <michaelneubert1988@gmail.com> | 2014-06-05 19:42:48 +0200 |
|---|---|---|
| committer | Michael <michaelneubert1988@gmail.com> | 2014-06-05 19:42:48 +0200 |
| commit | 83c2e79d52a57ec670b439ed6f822dd18e0ac55e (patch) | |
| tree | 774cb4f6a175e60ca979772559efa60411e9eff4 /src/server/game/Spells/Spell.cpp | |
| parent | 289a5c4318c5509eafeb36389a81bddc2ed349ca (diff) | |
| parent | 36102bea64d536b6ac04ac728c64321cfc5e55f2 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/scripts/Spells/spell_paladin.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 661c1ec340a..b64ee454e2e 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -569,7 +569,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; |