*Fix Alchemist's Stone.
--HG-- branch : trunk
This commit is contained in:
+1
-1
@@ -910,7 +910,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
|
|||||||
// Fill base trigger info
|
// Fill base trigger info
|
||||||
uint32 procAttacker = m_procAttacker;
|
uint32 procAttacker = m_procAttacker;
|
||||||
uint32 procVictim = m_procVictim;
|
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
|
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
|
if (missInfo==SPELL_MISS_NONE) // In case spell hit target, do all effect on that target
|
||||||
|
|||||||
@@ -1201,8 +1201,12 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr
|
|||||||
else // For spells need check school/spell family/family mask
|
else // For spells need check school/spell family/family mask
|
||||||
{
|
{
|
||||||
// Potions can trigger only if spellfamily given
|
// 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;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check (if set) for school
|
// Check (if set) for school
|
||||||
if(spellProcEvent->schoolMask && (spellProcEvent->schoolMask & procSpell->SchoolMask) == 0)
|
if(spellProcEvent->schoolMask && (spellProcEvent->schoolMask & procSpell->SchoolMask) == 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user