Core/Spells: Nourish will no longer get its bonus for active HoTs applied twice and optimized involved code

This commit is contained in:
Ovahlord committed 2023-01-23 10:08:52 +01:00
1 parent b0ff954322
commit ed53552995
2 files changed
+15 -21

No files matched your search

+11 -8
View File
@@ -1915,19 +1915,22 @@ class spell_dru_nourish : public SpellScript
if (!caster)
return;
auto periodicHealEffects = GetHitUnit()->GetAuraEffectsByType(SPELL_AURA_PERIODIC_HEAL);
if (std::any_of(periodicHealEffects.begin(), periodicHealEffects.end(), [caster](AuraEffect const* aurEff)
auto const& periodicHealEffects = GetHitUnit()->GetAuraEffectsByType(SPELL_AURA_PERIODIC_HEAL);
bool applyBonus = std::any_of(periodicHealEffects.begin(), periodicHealEffects.end(), [guid = caster->GetGUID()](AuraEffect const* aurEff)
{
return (aurEff->GetCasterGUID() == caster->GetGUID()
&& aurEff->GetSpellInfo()->SpellFamilyName == SPELLFAMILY_DRUID
&& !aurEff->GetSpellInfo()->SpellFamilyFlags.HasFlag(0x10 | 0x40, 0x10 | 0x4000000, 0));
}))
SetHitHeal(GetHitHeal() * 1.2f);
if (aurEff->GetCasterGUID() != guid || aurEff->GetSpellInfo()->SpellFamilyName != SPELLFAMILY_DRUID)
return false;
return aurEff->GetSpellInfo()->SpellFamilyFlags.HasFlag(0x10 | 0x40, 0x10 | 0x4000000, 0);
});
if (applyBonus)
SetEffectValue(GetEffectValue() * 1.2f);
}
void Register() override
{
OnEffectHitTarget.Register(&spell_dru_nourish::HandleHealBonus, EFFECT_0, SPELL_EFFECT_HEAL);
OnEffectLaunchTarget.Register(&spell_dru_nourish::HandleHealBonus, EFFECT_0, SPELL_EFFECT_HEAL);
}
};