aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/2013_07_26_04_world_spell_script_names_434.sql1
-rw-r--r--src/server/scripts/Spells/spell_generic.cpp56
2 files changed, 1 insertions, 56 deletions
diff --git a/sql/updates/world/2013_07_26_04_world_spell_script_names_434.sql b/sql/updates/world/2013_07_26_04_world_spell_script_names_434.sql
new file mode 100644
index 00000000000..7caf0b088dc
--- /dev/null
+++ b/sql/updates/world/2013_07_26_04_world_spell_script_names_434.sql
@@ -0,0 +1 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_magic_rooster'; \ No newline at end of file
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index f2a59f9800b..b155d4d38e2 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -1852,61 +1852,6 @@ class spell_gen_lifebloom : public SpellScriptLoader
uint32 _spellId;
};
-enum MagicRoosterSpells
-{
- SPELL_MAGIC_ROOSTER_NORMAL = 66122,
- SPELL_MAGIC_ROOSTER_DRAENEI_MALE = 66123,
- SPELL_MAGIC_ROOSTER_TAUREN_MALE = 66124
-};
-
-class spell_gen_magic_rooster : public SpellScriptLoader
-{
- public:
- spell_gen_magic_rooster() : SpellScriptLoader("spell_gen_magic_rooster") { }
-
- class spell_gen_magic_rooster_SpellScript : public SpellScript
- {
- PrepareSpellScript(spell_gen_magic_rooster_SpellScript);
-
- void HandleScript(SpellEffIndex effIndex)
- {
- PreventHitDefaultEffect(effIndex);
- if (Player* target = GetHitPlayer())
- {
- // prevent client crashes from stacking mounts
- target->RemoveAurasByType(SPELL_AURA_MOUNTED);
-
- uint32 spellId = SPELL_MAGIC_ROOSTER_NORMAL;
- switch (target->getRace())
- {
- case RACE_DRAENEI:
- if (target->getGender() == GENDER_MALE)
- spellId = SPELL_MAGIC_ROOSTER_DRAENEI_MALE;
- break;
- case RACE_TAUREN:
- if (target->getGender() == GENDER_MALE)
- spellId = SPELL_MAGIC_ROOSTER_TAUREN_MALE;
- break;
- default:
- break;
- }
-
- target->CastSpell(target, spellId, true);
- }
- }
-
- void Register() OVERRIDE
- {
- OnEffectHitTarget += SpellEffectFn(spell_gen_magic_rooster_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
- }
- };
-
- SpellScript* GetSpellScript() const OVERRIDE
- {
- return new spell_gen_magic_rooster_SpellScript();
- }
-};
-
/* DOCUMENTATION: Charge spells
Charge spells can be classified in four groups:
@@ -3711,7 +3656,6 @@ void AddSC_generic_spell_scripts()
new spell_gen_lifebloom("spell_cenarion_scout_lifebloom", SPELL_CENARION_SCOUT_LIFEBLOOM_FINAL_HEAL);
new spell_gen_lifebloom("spell_twisted_visage_lifebloom", SPELL_TWISTED_VISAGE_LIFEBLOOM_FINAL_HEAL);
new spell_gen_lifebloom("spell_faction_champion_dru_lifebloom", SPELL_FACTION_CHAMPIONS_DRU_LIFEBLOOM_FINAL_HEAL);
- new spell_gen_magic_rooster();
new spell_gen_mounted_charge();
new spell_gen_netherbloom();
new spell_gen_obsidian_armor();