Skip to content

Commit 8d9f9dd

Browse files
committed
remove hack
1 parent 6658f50 commit 8d9f9dd

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

src/server/scripts/Spells/spell_warrior.cpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,15 +1367,11 @@ class spell_warr_raging_blow_cooldown_reset : public SpellScript
13671367

13681368
if (roll_chance_i(value))
13691369
{
1370-
// HACK: Delay cast to prevent current spell from consuming SPELL_WARRIOR_ALWAYS_ANGRY charge
1371-
caster->m_Events.AddEventAtOffset([caster, originalCastId = GetSpell()->m_originalCastId, chargeCategoryId = GetSpellInfo()->ChargeCategoryId]()
1372-
{
1373-
caster->CastSpell(nullptr, SPELL_WARRIOR_ALWAYS_ANGRY, CastSpellExtraArgsInit{
1374-
.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
1375-
.OriginalCastId = originalCastId
1376-
});
1377-
caster->GetSpellHistory()->RestoreCharge(chargeCategoryId);
1378-
}, 0ms);
1370+
caster->CastSpell(nullptr, SPELL_WARRIOR_ALWAYS_ANGRY, CastSpellExtraArgsInit{
1371+
.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
1372+
.TriggeringSpell = GetSpell()
1373+
});
1374+
caster->GetSpellHistory()->RestoreCharge(GetSpellInfo()->ChargeCategoryId);
13791375
}
13801376
}
13811377

0 commit comments

Comments
 (0)