Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-06-27 19:39:23 +02:00
parent a2b860b781 52023b1e6b
commit f3de6f0284
22 changed files with 471 additions and 516 deletions
@@ -688,7 +688,7 @@ class spell_warl_haunt : public SpellScriptLoader
        {
            PrepareSpellScript(spell_warl_haunt_SpellScript);

-            void HandleOnHit()
+            void HandleAfterHit()
            {
                if (Aura* aura = GetHitAura())
                    if (AuraEffect* aurEff = aura->GetEffect(EFFECT_1))
@@ -697,7 +697,7 @@ class spell_warl_haunt : public SpellScriptLoader

            void Register() override
            {
-                OnHit += SpellHitFn(spell_warl_haunt_SpellScript::HandleOnHit);
+                AfterHit += SpellHitFn(spell_warl_haunt_SpellScript::HandleAfterHit);
            }
        };