From 6e580ad4770f76e463ca95d29219a66d43fc2a77 Mon Sep 17 00:00:00 2001 From: Ovalord <1Don7H4v3@m41L.com> Date: Fri, 22 Dec 2017 23:47:55 +0100 Subject: [PATCH] DB/Spells: removed focus spell casts for steady shot and cobra shot from spell_linked_spell --- sql/updates/world/4.3.4/custom_2017_12_22_05_world.sql | 1 + src/server/scripts/Spells/spell_hunter.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/4.3.4/custom_2017_12_22_05_world.sql diff --git a/sql/updates/world/4.3.4/custom_2017_12_22_05_world.sql b/sql/updates/world/4.3.4/custom_2017_12_22_05_world.sql new file mode 100644 index 00000000000..4ab11e31bdd --- /dev/null +++ b/sql/updates/world/4.3.4/custom_2017_12_22_05_world.sql @@ -0,0 +1 @@ +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (56641, 77767); diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 2596dc168f5..00b64366d51 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -1026,7 +1026,10 @@ class spell_hun_steady_shot : public SpellScriptLoader else if (caster->HasAura(SPELL_HUNTER_TERMINATION_R_1)) spellId = SPELL_HUNTER_TERMINATION_R_1; - uint32 amount = GetSpellInfo()->Effects[EFFECT_0].BasePoints; + uint32 amount = 0; + if (SpellInfo const* focusSpell = sSpellMgr->GetSpellInfo(SPELL_HUNTER_STEADY_SHOT_FOCUS)) + amount = focusSpell->Effects[EFFECT_0].BasePoints; + if (Aura* terminationAura = caster->GetAura(spellId)) { if (Unit* spellTarget = GetExplTargetUnit())