Merge branch 'master' into 4.x

Conflicts:
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp

1 files changed, 12 insertions, 4 deletions

diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/duskwood.cpp
index 872137ee937..5d04489bbca 100644
--- a/src/server/scripts/EasternKingdoms/duskwood.cpp
+++ b/src/server/scripts/EasternKingdoms/duskwood.cpp
@@ -25,6 +25,14 @@ EndScriptData */
 
 #include "ScriptPCH.h"
 
+enum Yells
+{
+    YELL_TWILIGHTCORRUPTOR_RESPAWN                                  = 0,
+    YELL_TWILIGHTCORRUPTOR_AGGRO                                    = 1,
+    YELL_TWILIGHTCORRUPTOR_KILL                                     = 2,
+};
+
+
 /*######
 # at_twilight_grove
 ######*/
@@ -43,11 +51,11 @@ public:
                 TCorrupter->setFaction(14);
                 TCorrupter->SetMaxHealth(832750);
             }
-            if (Unit* CorrupterSpeaker = player->SummonCreature(1, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()-1, 0, TEMPSUMMON_TIMED_DESPAWN, 15000))
+            if (Creature* CorrupterSpeaker = player->SummonCreature(1, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()-1, 0, TEMPSUMMON_TIMED_DESPAWN, 15000))
             {
                 CorrupterSpeaker->SetName("Twilight Corrupter");
                 CorrupterSpeaker->SetVisible(true);
-                CorrupterSpeaker->MonsterYell("Come, $N. See what the Nightmare brings...", 0, player->GetGUID());
+                CorrupterSpeaker->AI()->Talk(YELL_TWILIGHTCORRUPTOR_RESPAWN, player->GetGUID());
             }
         }
         return false;
@@ -89,7 +97,7 @@ public:
         }
         void EnterCombat(Unit* /*who*/)
         {
-            me->MonsterYell("The Nightmare cannot be stopped!", 0, me->GetGUID());
+            Talk(YELL_TWILIGHTCORRUPTOR_AGGRO);
         }
 
         void KilledUnit(Unit* victim)
@@ -97,7 +105,7 @@ public:
             if (victim->GetTypeId() == TYPEID_PLAYER)
             {
                 ++KillCount;
-                me->MonsterTextEmote("Twilight Corrupter squeezes the last bit of life out of $N and swallows their soul.", victim->GetGUID(), true);
+                Talk(YELL_TWILIGHTCORRUPTOR_KILL, victim->GetGUID());
 
                 if (KillCount == 3)
                 {