public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 07:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Spells): Prevent Kill Command cast without a pet (#24929)

Browse Source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
This commit is contained in:
blinkysc
2026-02-27 20:52:29 -06:00
committed by GitHub
parent cdfedcf799
commit 40c712faea
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/sql/updates/pending_db_world/rev_1772229530522788254.sql Normal file
View File

@@ -0,0 +1,3 @@
-- Add CheckCast script for Kill Command to prevent casting without a pet
DELETE FROM `spell_script_names` WHERE `spell_id` = 34026 AND `ScriptName` = 'spell_hun_kill_command';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES (34026, 'spell_hun_kill_command');

25
src/server/scripts/Spells/spell_hunter.cpp
View File

@@ -1518,6 +1518,30 @@ class spell_hun_explosive_shot : public SpellScript
} }
}; };
// 34026 - Kill Command
class spell_hun_kill_command : public SpellScript
{
PrepareSpellScript(spell_hun_kill_command);
SpellCastResult CheckCast()
{
Unit* caster = GetCaster();
if (!caster || !caster->IsPlayer())
return SPELL_FAILED_NO_VALID_TARGETS;
Pet* pet = caster->ToPlayer()->GetPet();
if (!pet)
return SPELL_FAILED_NO_PET;
return SPELL_CAST_OK;
}
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_hun_kill_command::CheckCast);
}
};
// 58914 - Kill Command (Pet Aura) // 58914 - Kill Command (Pet Aura)
class spell_hun_kill_command_pet : public AuraScript class spell_hun_kill_command_pet : public AuraScript
{ {
@@ -1704,6 +1728,7 @@ void AddSC_hunter_spell_scripts()
RegisterSpellScript(spell_hun_glyph_of_mend_pet); RegisterSpellScript(spell_hun_glyph_of_mend_pet);
// Proc system scripts // Proc system scripts
RegisterSpellScript(spell_hun_rapid_recuperation); RegisterSpellScript(spell_hun_rapid_recuperation);
RegisterSpellScript(spell_hun_kill_command);
RegisterSpellScript(spell_hun_kill_command_pet); RegisterSpellScript(spell_hun_kill_command_pet);
RegisterSpellScript(spell_hun_piercing_shots); RegisterSpellScript(spell_hun_piercing_shots);
RegisterSpellScript(spell_hun_rapid_recuperation_trigger); RegisterSpellScript(spell_hun_rapid_recuperation_trigger);