Core/Spells:
- rename SpellInfo::IsAOE to SpellInfo::IsTargetingArea due to ambiguity of old name. - add IsAffectingArea function to check whenever spell or it's effects are affecting objects in area and use new function to fix problems with hunter flares. Closes #3310. Thanks to Kaelima and Warpten for research.
This commit is contained in:
1 parent
aae833a759
commit
7e99e5f094
5 files changed
+23
-13
No files matched your search
@@ -5401,7 +5401,7 @@ SpellCastResult Spell::CheckCast(bool strict)
|
||||
}
|
||||
case SPELL_AURA_PERIODIC_MANA_LEECH:
|
||||
{
|
||||
if (m_spellInfo->Effects[i].IsArea())
|
||||
if (m_spellInfo->Effects[i].IsTargetingArea())
|
||||
break;
|
||||
|
||||
if (!m_targets.GetUnitTarget())
|
||||
@@ -6630,7 +6630,7 @@ void Spell::HandleLaunchPhase()
|
||||
continue;
|
||||
|
||||
// do not consume ammo anymore for Hunter's volley spell
|
||||
if (IsTriggered() && m_spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && m_spellInfo->IsAOE())
|
||||
if (IsTriggered() && m_spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && m_spellInfo->IsTargetingArea())
|
||||
usesAmmo = false;
|
||||
|
||||
if (usesAmmo)
|
||||
@@ -6681,7 +6681,7 @@ void Spell::DoAllEffectOnLaunchTarget(TargetInfo& targetInfo, float* multiplier)
|
||||
|
||||
if (m_damage > 0)
|
||||
{
|
||||
if (m_spellInfo->Effects[i].IsArea())
|
||||
if (m_spellInfo->Effects[i].IsTargetingArea())
|
||||
{
|
||||
m_damage = int32(float(m_damage) * unit->GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE, m_spellInfo->SchoolMask));
|
||||
if (m_caster->GetTypeId() == TYPEID_UNIT)
|
||||
|
||||
Reference in new issue
Block a user