sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Spells): Fix Avenging Wrath not greying out Divine Protection/Shield (#24778)

Browse Source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
This commit is contained in:
blinkysc
2026-02-20 18:48:23 -06:00
committed by GitHub
parent 5e1fd50776
commit b01e202244
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Spell.cpp
+4
View File
@@ -3201,6 +3201,10 @@ void Spell::DoTriggersOnSpellHit(Unit* unit, uint8 effMask)
/// @todo: move this code to scripts /// @todo: move this code to scripts
if (m_preCastSpell) if (m_preCastSpell)
{ {
// Avenging Wrath - also apply Immune Shield Marker
if (m_preCastSpell == 61987)
m_caster->CastSpell(unit, 61988, true);
// Fearie Fire (Feral) - damage // Fearie Fire (Feral) - damage
if (m_preCastSpell == 60089) if (m_preCastSpell == 60089)
m_caster->CastSpell(unit, m_preCastSpell, true); m_caster->CastSpell(unit, m_preCastSpell, true);
src/server/scripts/Spells/spell_paladin.cpp
+2 -5
View File
@@ -556,18 +556,15 @@ class spell_pal_avenging_wrath : public AuraScript
}); });
} }
void HandleApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{ {
Unit* target = GetTarget(); Unit* target = GetTarget();
if (AuraEffect const* sanctifiedWrathAurEff = target->GetAuraEffectOfRankedSpell(SPELL_PALADIN_SANCTIFIED_WRATH_TALENT_R1, EFFECT_2)) if (AuraEffect const* sanctifiedWrathAurEff = target->GetAuraEffectOfRankedSpell(SPELL_PALADIN_SANCTIFIED_WRATH_TALENT_R1, EFFECT_2))
{ {
int32 basepoints = sanctifiedWrathAurEff->GetAmount(); int32 basepoints = sanctifiedWrathAurEff->GetAmount();
target->CastCustomSpell(target, SPELL_PALADIN_SANCTIFIED_WRATH, &basepoints, &basepoints, nullptr, true, nullptr, sanctifiedWrathAurEff); target->CastCustomSpell(target, SPELL_PALADIN_SANCTIFIED_WRATH, &basepoints, &basepoints, nullptr, true, nullptr, sanctifiedWrathAurEff);
} }
target->CastSpell(target, SPELL_PALADIN_AVENGING_WRATH_MARKER, true, nullptr, aurEff);
// Blizz seems to just apply aura without bothering to cast
target->AddAura(SPELL_PALADIN_IMMUNE_SHIELD_MARKER, target);
} }
void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)