[c12640] Fix sending player cooldowns after map change/login and Correct logic in SpellMgr::IsSpellProcEventCanTriggeredBy

This commit is contained in:
Dramacydal 2013-06-17 10:45:17 +01:00 committed by Antz
parent 622cd2edd2
commit 5bb01c478e
3 changed files with 3 additions and 3 deletions

View file

@ -1773,7 +1773,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr
SpellClassOptionsEntry const* spellClassOptions = procSpell->GetSpellClassOptions();
// Check (if set) for spellFamilyName
if (spellProcEvent->spellFamilyName && (!spellClassOptions || spellProcEvent->spellFamilyName != spellClassOptions->SpellFamilyName))
if (spellProcEvent->spellFamilyName && (!spellClassOptions && spellProcEvent->spellFamilyName != SPELLFAMILY_GENERIC || spellProcEvent->spellFamilyName != spellClassOptions->SpellFamilyName))
return false;
}
}