diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Spell.cpp | 2 | ||||
| -rw-r--r-- | src/game/SpellMgr.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 8d6ae5ba67a..1f31c3d2d88 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -910,7 +910,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) // Fill base trigger info uint32 procAttacker = m_procAttacker; uint32 procVictim = m_procVictim; - uint32 procEx = m_triggeredByAuraSpell || m_CastItem ? PROC_EX_INTERNAL_TRIGGERED : PROC_EX_NONE; + uint32 procEx = m_triggeredByAuraSpell? PROC_EX_INTERNAL_TRIGGERED : PROC_EX_NONE; m_spellAura = NULL; // Set aura to null for every target-make sure that pointer is not used for unit without aura applied if (missInfo==SPELL_MISS_NONE) // In case spell hit target, do all effect on that target diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 328da769b86..c3467ad7e1a 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1201,8 +1201,12 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr else // For spells need check school/spell family/family mask { // Potions can trigger only if spellfamily given - if (procSpell->SpellFamilyName == SPELLFAMILY_POTION && !spellProcEvent->spellFamilyName) + if (procSpell->SpellFamilyName == SPELLFAMILY_POTION) + { + if (procSpell->SpellFamilyName == spellProcEvent->spellFamilyName) + return true; return false; + } // Check (if set) for school if(spellProcEvent->schoolMask && (spellProcEvent->schoolMask & procSpell->SchoolMask) == 0) |