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

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp

4 files changed, 75 insertions, 114 deletions

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index a7fa54b12e1..b5c226b15cb 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -940,7 +940,7 @@ void hyjalAI::WaypointReached(uint32 waypointId)
 {
     if (waypointId == 1 || (waypointId == 0 && me->GetEntry() == THRALL))
     {
-        me->MonsterYell(YELL_HURRY, LANG_UNIVERSAL, NULL);
+        me->Yell(YELL_HURRY, LANG_UNIVERSAL);
         WaitForTeleport = true;
         TeleportTimer = 20000;
         if (me->GetEntry() == JAINA)
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 93252802522..9bcc7c933fb 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -29,7 +29,6 @@ EndScriptData */
 #include "hyjal_trash.h"
 #include "Player.h"
 #include "WorldPacket.h"
-#include "Opcodes.h"
 #include "Chat.h"
 #include "WorldSession.h"
 
@@ -186,16 +185,13 @@ public:
 
                                     for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
                                     {
-                                         if (i->GetSource())
+                                         if (Player* player = i->GetSource())
                                          {
                                             WorldPacket packet;
-                                            ChatHandler::BuildChatPacket(packet, CHAT_MSG_MONSTER_YELL, LANG_UNIVERSAL, unit, i->GetSource(), YELL_EFFORTS);
-                                            i->GetSource()->GetSession()->SendPacket(&packet);
 
-                                            WorldPacket data2(SMSG_PLAY_SOUND, 4);
-                                            data2 << uint32(10986);
-                                            data2 << uint64(unit->GetGUID());
-                                            i->GetSource()->GetSession()->SendPacket(&data2);
+                                            ChatHandler::BuildChatPacket(packet, CHAT_MSG_MONSTER_YELL, LANG_UNIVERSAL, unit, player, YELL_EFFORTS);
+                                            player->SendDirectMessage(&packet);
+                                            player->PlayDirectSound(10986, player);
                                          }
                                     }
                                 }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
index 3d1e9363cd8..7b3314ef4e9 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
@@ -229,7 +229,7 @@ public:
         void JustDied(Unit* /*killer*/) override
         {
             instance->SetBossState(DATA_MAL_GANIS, DONE);
-            DoCastAOE(SPELL_MAL_GANIS_KILL_CREDIT);
+            DoCastAOE(SPELL_MAL_GANIS_KILL_CREDIT, true);
             // give achievement credit and LFG rewards to players. criteria use spell 58630 which doesn't exist, but it was created in spell_dbc
             DoCastAOE(SPELL_KILL_CREDIT);
         }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
index 6925badf272..ec7aa742975 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
@@ -15,14 +15,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* Script Data Start
-SDName: Boss salramm
-SDAuthor: Tartalo
-SD%Complete: 80
-SDComment: @todo Intro
-SDCategory:
-Script Data End */
-
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "culling_of_stratholme.h"
@@ -31,9 +23,7 @@ enum Spells
 {
     SPELL_CURSE_OF_TWISTED_FLESH                = 58845,
     SPELL_EXPLODE_GHOUL                         = 52480,
-    H_SPELL_EXPLODE_GHOUL                       = 58825,
     SPELL_SHADOW_BOLT                           = 57725,
-    H_SPELL_SHADOW_BOLT                         = 58828,
     SPELL_STEAL_FLESH                           = 52708,
     SPELL_SUMMON_GHOULS                         = 52451
 };
@@ -49,114 +39,89 @@ enum Yells
     SAY_SUMMON_GHOULS                           = 6
 };
 
-class boss_salramm : public CreatureScript
+enum Events
 {
-public:
-    boss_salramm() : CreatureScript("boss_salramm") { }
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return GetInstanceAI<boss_salrammAI>(creature);
-    }
-
-    struct boss_salrammAI : public ScriptedAI
-    {
-        boss_salrammAI(Creature* creature) : ScriptedAI(creature)
-        {
-            Initialize();
-            instance = creature->GetInstanceScript();
-            Talk(SAY_SPAWN);
-        }
-
-        void Initialize()
-        {
-            uiCurseFleshTimer = 30000;  //30s DBM
-            uiExplodeGhoulTimer = urand(25000, 28000); //approx 6 sec after summon ghouls
-            uiShadowBoltTimer = urand(8000, 12000); // approx 10s
-            uiStealFleshTimer = 12345;
-            uiSummonGhoulsTimer = urand(19000, 24000); //on a video approx 24s after aggro
-        }
-
-        uint32 uiCurseFleshTimer;
-        uint32 uiExplodeGhoulTimer;
-        uint32 uiShadowBoltTimer;
-        uint32 uiStealFleshTimer;
-        uint32 uiSummonGhoulsTimer;
-
-        InstanceScript* instance;
-
-        void Reset() override
-        {
-            Initialize();
-
-            instance->SetBossState(DATA_SALRAMM, NOT_STARTED);
-        }
-
-        void EnterCombat(Unit* /*who*/) override
-        {
-            Talk(SAY_AGGRO);
+    EVENT_CURSE_FLESH                           = 1,
+    EVENT_EXPLODE_GHOUL,
+    EVENT_SHADOW_BOLT,
+    EVENT_STEAL_FLESH,
+    EVENT_SUMMON_GHOULS
+};
 
-            instance->SetBossState(DATA_SALRAMM, IN_PROGRESS);
-        }
+class boss_salramm : public CreatureScript
+{
+    public:
+        boss_salramm() : CreatureScript("boss_salramm") { }
 
-        void UpdateAI(uint32 diff) override
+        struct boss_salrammAI : public BossAI
         {
-            //Return since we have no target
-            if (!UpdateVictim())
-                return;
-
-            //Curse of twisted flesh timer
-            if (uiCurseFleshTimer <= diff)
+            boss_salrammAI(Creature* creature) : BossAI(creature, DATA_SALRAMM)
             {
-                DoCastVictim(SPELL_CURSE_OF_TWISTED_FLESH);
-                uiCurseFleshTimer = 37000;
-            } else uiCurseFleshTimer -= diff;
+                Talk(SAY_SPAWN);
+            }
 
-            //Shadow bolt timer
-            if (uiShadowBoltTimer <= diff)
+            void EnterCombat(Unit* /*who*/) override
             {
-                if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
-                    DoCast(target, SPELL_SHADOW_BOLT);
-                uiShadowBoltTimer = urand(8000, 12000);
-            } else uiShadowBoltTimer -= diff;
+                Talk(SAY_AGGRO);
+                _EnterCombat();
 
-            //Steal Flesh timer
-            if (uiStealFleshTimer <= diff)
-            {
-                Talk(SAY_STEAL_FLESH);
-                if (Unit* random_pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
-                    DoCast(random_pTarget, SPELL_STEAL_FLESH);
-                uiStealFleshTimer = 10000;
-            } else uiStealFleshTimer -= diff;
+                events.ScheduleEvent(EVENT_CURSE_FLESH, 30000);
+                events.ScheduleEvent(EVENT_SUMMON_GHOULS, urand(19000, 24000));
+                events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(8000, 12000));
+                events.ScheduleEvent(EVENT_STEAL_FLESH, 12345); /// @todo: adjust timer 
+            }
 
-            //Summon ghouls timer
-            if (uiSummonGhoulsTimer <= diff)
+            void ExecuteEvent(uint32 eventId) override
             {
-                Talk(SAY_SUMMON_GHOULS);
-                if (Unit* random_pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
-                    DoCast(random_pTarget, SPELL_SUMMON_GHOULS);
-                uiSummonGhoulsTimer = 10000;
-            } else uiSummonGhoulsTimer -= diff;
-
-            DoMeleeAttackIfReady();
-        }
-
-        void JustDied(Unit* /*killer*/) override
-        {
-            Talk(SAY_DEATH);
+                switch (eventId)
+                {
+                    case EVENT_CURSE_FLESH:
+                        DoCastVictim(SPELL_CURSE_OF_TWISTED_FLESH);
+                        events.ScheduleEvent(EVENT_CURSE_FLESH, 37000);
+                        break;
+                    case EVENT_SUMMON_GHOULS:
+                        Talk(SAY_SUMMON_GHOULS);
+                        DoCast(me, SPELL_SUMMON_GHOULS);
+                        events.ScheduleEvent(EVENT_SUMMON_GHOULS, 10000);
+                        events.ScheduleEvent(EVENT_EXPLODE_GHOUL, 6000);
+                        break;
+                    case EVENT_SHADOW_BOLT:
+                        if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
+                            DoCast(target, SPELL_SHADOW_BOLT);
+                        events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(8000, 12000));
+                        break;
+                    case EVENT_STEAL_FLESH:
+                        Talk(SAY_STEAL_FLESH);
+                        if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true))
+                            DoCast(target, SPELL_STEAL_FLESH);
+                        events.ScheduleEvent(EVENT_STEAL_FLESH, 12345);
+                        break;
+                    case EVENT_EXPLODE_GHOUL:
+                        Talk(SAY_EXPLODE_GHOUL);
+                        DoCast(me, SPELL_EXPLODE_GHOUL, true);
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            void JustDied(Unit* /*killer*/) override
+            {
+                Talk(SAY_DEATH);
+                _JustDied();
+            }
 
-            instance->SetBossState(DATA_SALRAMM, DONE);
-        }
+            void KilledUnit(Unit* victim) override
+            {
+                if (victim->GetTypeId() == TYPEID_PLAYER)
+                    Talk(SAY_SLAY);
+            }
+        };
 
-        void KilledUnit(Unit* victim) override
+        CreatureAI* GetAI(Creature* creature) const override
         {
-            if (victim->GetTypeId() != TYPEID_PLAYER)
-                return;
-
-            Talk(SAY_SLAY);
+            return GetInstanceAI<boss_salrammAI>(creature);
         }
-    };
-
 };
 
 void AddSC_boss_salramm()