diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-06 21:49:12 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-06 21:49:12 +0100 |
| commit | 1fbc25766f0022774c75da834543e2ec38a4f564 (patch) | |
| tree | 9d3aac114fed5f3a76b7c876bf2d5ff9f1922ea5 /src/server/game/Spells/Spell.cpp | |
| parent | 443ea1282706ffe03730fbb51fe9d0738fbf68e2 (diff) | |
| parent | f27a83e98feca1df207b6e0084763f6be7d90af9 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
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 88d23179712..ba570ad73a4 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -6534,7 +6534,7 @@ bool Spell::CheckEffectTarget(Unit const* target, uint32 eff) const break; } - if (IsTriggered() || m_spellInfo->AttributesEx2 & SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS) + if (IsTriggered() || m_spellInfo->AttributesEx2 & SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS || DisableMgr::IsDisabledFor(DISABLE_TYPE_SPELL, m_spellInfo->Id, NULL, SPELL_DISABLE_LOS)) return true; // todo: shit below shouldn't be here, but it's temporary |