nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-03-16 14:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/Spell): improve handling of refreshing diseases with Glyph of Disease (#22434)

Browse Source
This commit is contained in:
Tereneckla
2025-07-29 13:07:52 +00:00
committed by GitHub
parent ddefd87fef
commit 9cf742a04b
1 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/server/scripts/Spells/spell_dk.cpp
View File

@@ -74,6 +74,9 @@ enum DeathKnightSpells
SPELL_DK_UNHOLY_PRESENCE_TRIGGERED = 49772, SPELL_DK_UNHOLY_PRESENCE_TRIGGERED = 49772,
SPELL_DK_WILL_OF_THE_NECROPOLIS_TALENT_R1 = 49189, SPELL_DK_WILL_OF_THE_NECROPOLIS_TALENT_R1 = 49189,
SPELL_DK_WILL_OF_THE_NECROPOLIS_AURA_R1 = 52284, SPELL_DK_WILL_OF_THE_NECROPOLIS_AURA_R1 = 52284,
SPELL_DK_ICY_TALONS_TALENT_R1 = 50880,
SPELL_DK_CRYPT_FEVER_R1 = 50508,
SPELL_DK_EBON_PLAGUE_R1 = 51726,
// Risen Ally // Risen Ally
SPELL_DK_RAISE_ALLY = 46619, SPELL_DK_RAISE_ALLY = 46619,
SPELL_DK_THRASH = 47480, SPELL_DK_THRASH = 47480,
@@ -1746,7 +1749,8 @@ class spell_dk_pestilence : public SpellScript
{ {
SPELL_DK_GLYPH_OF_DISEASE, SPELL_DK_GLYPH_OF_DISEASE,
SPELL_DK_BLOOD_PLAGUE, SPELL_DK_BLOOD_PLAGUE,
SPELL_DK_FROST_FEVER SPELL_DK_FROST_FEVER,
SPELL_DK_ICY_TALONS_TALENT_R1
}); });
} }
@@ -1758,46 +1762,36 @@ class spell_dk_pestilence : public SpellScript
if (!target) if (!target)
return; return;
if (target != hitUnit || caster->GetAura(SPELL_DK_GLYPH_OF_DISEASE)) // Spread on others
if (target != hitUnit)
{ {
// xinef: checked in target selection
//if (!m_targets.GetUnitTarget()->IsWithinLOSInMap(unitTarget))
// return;
// And spread them on target
// Blood Plague // Blood Plague
if (Aura* disOld = target->GetAura(SPELL_DK_BLOOD_PLAGUE, caster->GetGUID())) if (target->GetAura(SPELL_DK_BLOOD_PLAGUE, caster->GetGUID()))
if (AuraEffect* effOld = disOld->GetEffect(EFFECT_0)) caster->CastSpell(hitUnit, SPELL_DK_BLOOD_PLAGUE, true);
{
float pctMods = effOld->GetPctMods();
float crit = effOld->GetCritChance();
caster->CastSpell(hitUnit, SPELL_DK_BLOOD_PLAGUE, true);
if (Aura* disNew = hitUnit->GetAura(SPELL_DK_BLOOD_PLAGUE, caster->GetGUID()))
if (AuraEffect* effNew = disNew->GetEffect(EFFECT_0))
{
effNew->SetPctMods(pctMods);
effNew->SetCritChance(crit);
effNew->SetAmount(effNew->CalculateAmount(effNew->GetCaster()));
}
}
// Frost Fever // Frost Fever
if (Aura* disOld = target->GetAura(SPELL_DK_FROST_FEVER, caster->GetGUID())) if (target->GetAura(SPELL_DK_FROST_FEVER, caster->GetGUID()))
if (AuraEffect* effOld = disOld->GetEffect(EFFECT_0)) caster->CastSpell(hitUnit, SPELL_DK_FROST_FEVER, true);
{ }
float pctMods = effOld->GetPctMods(); // Refresh on target
float crit = effOld->GetCritChance(); else if (caster->GetAura(SPELL_DK_GLYPH_OF_DISEASE))
caster->CastSpell(hitUnit, SPELL_DK_FROST_FEVER, true); {
// Blood Plague
if (Aura* disease = target->GetAura(SPELL_DK_BLOOD_PLAGUE, caster->GetGUID()))
disease->RefreshDuration();
if (Aura* disNew = hitUnit->GetAura(SPELL_DK_FROST_FEVER, caster->GetGUID())) // Frost Fever
if (AuraEffect* effNew = disNew->GetEffect(EFFECT_0)) if (Aura* disease = target->GetAura(SPELL_DK_FROST_FEVER, caster->GetGUID()))
{ {
effNew->SetPctMods(pctMods); disease->RefreshDuration();
effNew->SetCritChance(crit); if (Aura const* talons = caster->GetAuraOfRankedSpell(SPELL_DK_ICY_TALONS_TALENT_R1))
effNew->SetAmount(effNew->CalculateAmount(effNew->GetCaster())); caster->CastSpell(caster, talons->GetSpellInfo()->Effects[EFFECT_0].TriggerSpell, true);
} }
}
if (Aura* disease = target->GetAuraOfRankedSpell(SPELL_DK_EBON_PLAGUE_R1, caster->GetGUID()))
disease->RefreshDuration();
else if (Aura* disease = target->GetAuraOfRankedSpell(SPELL_DK_CRYPT_FEVER_R1, caster->GetGUID()))
disease->RefreshDuration();
} }
} }