From 7b85223ad89b195639817ab6db901b2337f28861 Mon Sep 17 00:00:00 2001
From: Aokromes <aokromes@gmail.com>
Date: Mon, 16 Apr 2018 10:39:11 +0200
Subject: [PATCH] DB/Misc: Fix some startup errors

---
 .../world/4.3.4/2018_04_16_00_world.sql       | 33 +++++++++++++++++++
 src/server/scripts/Spells/spell_warrior.cpp   | 29 ----------------
 2 files changed, 33 insertions(+), 29 deletions(-)
 create mode 100644 sql/updates/world/4.3.4/2018_04_16_00_world.sql

diff --git a/sql/updates/world/4.3.4/2018_04_16_00_world.sql b/sql/updates/world/4.3.4/2018_04_16_00_world.sql
new file mode 100644
index 0000000000..5692be4c9d
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_04_16_00_world.sql
@@ -0,0 +1,33 @@
+--
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_dk_death_rune';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_dk_mark_of_blood';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_dk_necrosis';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_dk_vendetta';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_dk_wandering_plague';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_hun_glyph_of_mend_pet';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_mage_burning_determination';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_mage_empowered_fire';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_mage_imp_blizzard';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_mage_magic_absorption';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_pal_heart_of_the_crusader';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_pal_improved_lay_of_hands';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_pal_judgement_of_light_heal';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_pal_judgement_of_wisdom_mana';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_pal_spiritual_attunement';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_pri_imp_shadowform';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_pri_improved_spirit_tap';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_warl_improved_drain_soul';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_warr_glyph_of_blocking';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_warr_improved_spell_reflection';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_pal_righteous_vengeance';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_pal_seals';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_pal_seal_of_corruption';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_pal_seal_of_vengeance';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_rog_quick_recovery';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_rog_setup';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_rog_turn_the_tables';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_rog_turn_the_tables_proc';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sha_astral_shift_aura';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sha_glyph_of_totem_of_wrath';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sha_lightning_overload';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_sha_tidal_force_dummy';
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index de6efd2a9a..c5b0a51471 100644
--- a/src/server/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
@@ -364,34 +364,6 @@ class spell_warr_glyph_of_sunder_armor : public SpellScriptLoader
         }
 };
 
-// 59725 - Improved Spell Reflection
-class spell_warr_improved_spell_reflection : public SpellScriptLoader
-{
-    public:
-        spell_warr_improved_spell_reflection() : SpellScriptLoader("spell_warr_improved_spell_reflection") { }
-
-        class spell_warr_improved_spell_reflection_SpellScript : public SpellScript
-        {
-            PrepareSpellScript(spell_warr_improved_spell_reflection_SpellScript);
-
-            void FilterTargets(std::list<WorldObject*>& unitList)
-            {
-                if (GetCaster())
-                    unitList.remove(GetCaster());
-            }
-
-            void Register() override
-            {
-                OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_improved_spell_reflection_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY);
-            }
-        };
-
-        SpellScript* GetSpellScript() const override
-        {
-            return new spell_warr_improved_spell_reflection_SpellScript();
-        }
-};
-
 // 5246 - Intimidating Shout
 class spell_warr_intimidating_shout : public SpellScriptLoader
 {
@@ -1084,7 +1056,6 @@ void AddSC_warrior_spell_scripts()
     new spell_warr_deep_wounds();
     new spell_warr_execute();
     new spell_warr_glyph_of_sunder_armor();
-    new spell_warr_improved_spell_reflection();
     new spell_warr_intimidating_shout();
     new spell_warr_lambs_to_the_slaughter();
     new spell_warr_last_stand();