Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Spells: Fix warrior bloodthirst heal (#31027)

Browse Source
This commit is contained in:
Jeremy
2025-06-15 10:02:54 +02:00
committed by GitHub
parent f429777cdc
commit 65276ba69a
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/updates/world/master/2025_06_15_02_world.sql Normal file
View File

@@ -0,0 +1,4 @@
DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_warr_bloodthirst';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(215568, 'spell_warr_bloodthirst'),
(335096, 'spell_warr_bloodthirst');

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

@@ -106,6 +106,7 @@ class spell_warr_avatar : public SpellScript
};
// 23881 - Bloodthirst
// 335096 - Bloodbath
class spell_warr_bloodthirst : public SpellScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override
@@ -113,14 +114,21 @@ class spell_warr_bloodthirst : public SpellScript
return ValidateSpellInfo({ SPELL_WARRIOR_BLOODTHIRST_HEAL });
}
void HandleDummy(SpellEffIndex /*effIndex*/)
void CastHeal(SpellEffIndex /*effIndex*/) const
{
GetCaster()->CastSpell(GetCaster(), SPELL_WARRIOR_BLOODTHIRST_HEAL, true);
if (GetHitUnit() != GetExplTargetUnit())
return;
GetCaster()->CastSpell(GetCaster(), SPELL_WARRIOR_BLOODTHIRST_HEAL, CastSpellExtraArgsInit
{
.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
.TriggeringSpell = GetSpell()
});
}
void Register() override
{
OnEffectHit += SpellEffectFn(spell_warr_bloodthirst::HandleDummy, EFFECT_3, SPELL_EFFECT_DUMMY);
OnEffectHitTarget += SpellEffectFn(spell_warr_bloodthirst::CastHeal, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};