Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-06 08:59:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Blood and Thunder will now only trigger with Rend effects applied by the caster

Browse Source 
*optimized the checks while at it
This commit is contained in:
Ovahlord
2022-04-02 18:59:47 +02:00
parent 99c47ca94d
commit 7943bfb483
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/server/scripts/Spells/spell_warrior.cpp
View File

@@ -856,18 +856,21 @@ class spell_warr_thunder_clap : public SpellScript
bool Load() override
{
_allowRendSpread = false;
if (AuraEffect* aurEff = GetCaster()->GetDummyAuraEffect(SPELLFAMILY_WARRIOR, WARRIOR_ICON_ID_BLOOD_AND_THUNDER, EFFECT_0))
return roll_chance_i(aurEff->GetAmount());
return false;
}
void FilterTargets(std::list<WorldObject*>& unitList)
void FilterTargets(std::list<WorldObject*>& targets)
{
for (std::list<WorldObject*>::const_iterator itr = unitList.begin(); itr != unitList.end(); ++itr)
if (Unit* target = (*itr)->ToUnit())
if (target->HasAura(SPELL_WARRIOR_REND))
_allowRendSpread = true;
AuraEffect const* aurEff = GetCaster()->GetDummyAuraEffect(SPELLFAMILY_WARRIOR, WARRIOR_ICON_ID_BLOOD_AND_THUNDER, EFFECT_0);
if (!aurEff || !roll_chance_i(aurEff->GetAmount()))
return;
for (WorldObject const* target : targets)
{
if (!target->IsUnit() || !target->ToUnit()->HasAura(SPELL_WARRIOR_REND, GetCaster()->GetGUID()))
continue;
_allowRendSpread = true;
}
}
void HandleHit(SpellEffIndex /*effIndex*/)
@@ -881,7 +884,6 @@ class spell_warr_thunder_clap : public SpellScript
OnObjectAreaTargetSelect.Register(&spell_warr_thunder_clap::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_warr_thunder_clap::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
private:
bool _allowRendSpread;
};