nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 01:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Spells): Fixed explosive shot ammo consumption (#21501)

Browse Source 
Co-authored-by: pavel_k <pavel_k@mail.com>
Co-authored-by: Jelle Meeus <sogladev@gmail.com>
This commit is contained in:
Paul
2025-07-15 10:05:56 +03:00
committed by GitHub
parent 506722ee88
commit 38cb6ace25
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,3 @@
--
DELETE FROM `spell_script_names` WHERE `spell_id` = -53301 AND `ScriptName` = 'spell_hun_explosive_shot';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES (-53301, 'spell_hun_explosive_shot');

2
src/server/game/Spells/Spell.cpp
View File

@@ -5405,7 +5405,7 @@ void Spell::TakePower()
void Spell::TakeAmmo()
{
if (m_attackType == RANGED_ATTACK && m_caster->IsPlayer())
if (m_attackType == RANGED_ATTACK && m_caster->IsPlayer() && !m_spellInfo->HasAttribute(SPELL_ATTR6_DO_NOT_CONSUME_RESOURCES))
{
Item* pItem = m_caster->ToPlayer()->GetWeaponForAttack(RANGED_ATTACK);

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

@@ -1347,6 +1347,27 @@ class spell_hun_target_self_and_pet : public SpellScript
}
};
// -53301 - Explosive Shot
class spell_hun_explosive_shot : public SpellScript
{
PrepareSpellScript(spell_hun_explosive_shot);
void HandleFinish()
{
// Handling of explosive shot initial cast without LnL proc
if (!GetCaster() || !GetCaster()->IsPlayer())
return;
if (!GetCaster()->HasAura(SPELL_LOCK_AND_LOAD_TRIGGER))
GetSpell()->TakeAmmo();
}
void Register() override
{
AfterCast += SpellCastFn(spell_hun_explosive_shot::HandleFinish);
}
};
void AddSC_hunter_spell_scripts()
{
RegisterSpellScript(spell_hun_check_pet_los);
@@ -1378,4 +1399,5 @@ void AddSC_hunter_spell_scripts()
RegisterSpellScript(spell_hun_intimidation);
RegisterSpellScript(spell_hun_bestial_wrath);
RegisterSpellScript(spell_hun_target_self_and_pet);
RegisterSpellScript(spell_hun_explosive_shot);
}