From e26294db568a220af460ebf04cef5213d541e280 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Wed, 29 Dec 2010 11:58:09 +0100 Subject: [PATCH] Scripts: Correct function registration of spell_dru_moonkin_form_passive_AuraScript, fix intendation in world_database.sql Author: QAston --- sql/base/world_database.sql | 6 +++--- src/server/scripts/Spells/spell_druid.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql index ea7b427c7c2..afe2a8e2486 100644 --- a/sql/base/world_database.sql +++ b/sql/base/world_database.sql @@ -26958,13 +26958,13 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES ( 47422, 'spell_warl_everlasting_affliction'), -- druid ( 54846, 'spell_dru_glyph_of_starfire'), -(69366, 'spell_dru_moonkin_form_passive'), +( 69366, 'spell_dru_moonkin_form_passive'), (-33851, 'spell_dru_primal_tenacity'), -(62606, 'spell_dru_savage_defense'), +( 62606, 'spell_dru_savage_defense'), -- example ( 66244, 'spell_ex_66244'), ( 5581, 'spell_ex_5581'), -(47299, 'spell_ex_absorb_aura'); +( 47299, 'spell_ex_absorb_aura'); /*!40000 ALTER TABLE `spell_script_names` ENABLE KEYS */; UNLOCK TABLES; diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 6fb2da82346..47e5ad00a87 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -110,8 +110,8 @@ public: void Register() { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_moonkin_form_passive_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB); - OnEffectAbsorb += AuraEffectAbsorbFn(spell_dru_moonkin_form_passive_AuraScript::Absorb, EFFECT_1); + DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_moonkin_form_passive_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); + OnEffectAbsorb += AuraEffectAbsorbFn(spell_dru_moonkin_form_passive_AuraScript::Absorb, EFFECT_0); } };