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

Conflicts:
	src/server/game/World/World.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
index 3f935077b22..4571798506e 100644
--- a/src/server/scripts/Spells/spell_warlock.cpp
+++ b/src/server/scripts/Spells/spell_warlock.cpp
@@ -518,7 +518,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))
@@ -527,7 +527,7 @@ class spell_warl_haunt : public SpellScriptLoader
 
             void Register() override
             {
-                OnHit += SpellHitFn(spell_warl_haunt_SpellScript::HandleOnHit);
+                AfterHit += SpellHitFn(spell_warl_haunt_SpellScript::HandleAfterHit);
             }
         };