Core/Spells: fix runtime error

Partial revert of 11650e4008871138cfec61f84e280adb2cdd2d5d

2 files changed, 6 insertions, 30 deletions

diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 94d34d78bd6..b7eeb238a2c 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -3004,6 +3004,12 @@ void SpellMgr::LoadSpellInfoCorrections()
             case 53385: // Divine Storm (Damage)
                 spellInfo->MaxAffectedTargets = 4;
                 break;
+            case 56342: // Lock and Load (Rank 1)
+                // @workaround: Delete dummy effect from rank 1,
+                // effect apply aura has TargetA == TargetB == 0 but core still applies it to caster
+                // core bug?
+                spellInfo->Effects[EFFECT_2].Effect = 0;
+                break;
             case 53480: // Roar of Sacrifice
                 // missing spell effect 2 data, taken from 4.3.4
                 spellInfo->Effects[EFFECT_1].Effect = SPELL_EFFECT_APPLY_AURA;
diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index e95bfe4395c..2eba605f8b3 100644
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@@ -664,35 +664,6 @@ class spell_hun_lock_and_load : public SpellScriptLoader
         }
 };
 
-// 56342 - Lock and Load (Rank 1)
-class spell_hun_lock_and_load_dummy : public SpellScriptLoader
-{
-    public:
-        spell_hun_lock_and_load_dummy() : SpellScriptLoader("spell_hun_lock_and_load_dummy") { }
-
-        class spell_hun_lock_and_load_dummy_AuraScript : public AuraScript
-        {
-            PrepareAuraScript(spell_hun_lock_and_load_dummy_AuraScript);
-
-            bool DummyCheck(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
-            {
-                // Prevents Aura proc from this dummy effect
-                // Only rank 1 has this aura
-                return false;
-            }
-
-            void Register() override
-            {
-                DoCheckEffectProc += AuraCheckEffectProcFn(spell_hun_lock_and_load_dummy_AuraScript::DummyCheck, EFFECT_2, SPELL_AURA_DUMMY);
-            }
-        };
-
-        AuraScript* GetAuraScript() const override
-        {
-            return new spell_hun_lock_and_load_dummy_AuraScript();
-        }
-};
-
 // 53271 - Masters Call
 class spell_hun_masters_call : public SpellScriptLoader
 {
@@ -1514,7 +1485,6 @@ void AddSC_hunter_spell_scripts()
     new spell_hun_kill_command_pet();
     new spell_hun_last_stand_pet();
     new spell_hun_lock_and_load();
-    new spell_hun_lock_and_load_dummy();
     new spell_hun_masters_call();
     new spell_hun_misdirection();
     new spell_hun_misdirection_proc();