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

Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/Weather.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/CMakeLists.txt

3 files changed, 53 insertions, 45 deletions

diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
index fa1ab5528ca..1303f5c4f58 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
@@ -32,12 +32,20 @@ enum Say
     SAY_LEASH               = 1,
 };
 
+enum Events
+{
+    EVENT_CLEAVE            = 1,
+    EVENT_MORTAL_STRIKE     = 2,
+    EVENT_BLAST_WAVE        = 3,
+    EVENT_KNOCK_BACK        = 4,
+};
+
 enum Spells
 {
     SPELL_CLEAVE            = 26350,
-    SPELL_BLASTWAVE         = 23331,
-    SPELL_MORTALSTRIKE      = 24573,
-    SPELL_KNOCKBACK         = 25778
+    SPELL_BLAST_WAVE        = 23331,
+    SPELL_MORTAL_STRIKE     = 24573,
+    SPELL_KNOCK_BACK        = 25778
 };
 
 class boss_broodlord : public CreatureScript
@@ -54,17 +62,13 @@ public:
     {
         boss_broodlordAI(Creature* creature) : ScriptedAI(creature) {}
 
-        uint32 Cleave_Timer;
-        uint32 BlastWave_Timer;
-        uint32 MortalStrike_Timer;
-        uint32 KnockBack_Timer;
-
         void Reset()
         {
-            Cleave_Timer = 8000;                                // These times are probably wrong
-            BlastWave_Timer = 12000;
-            MortalStrike_Timer = 20000;
-            KnockBack_Timer = 30000;
+            // These timers are probably wrong
+            events.ScheduleEvent(EVENT_CLEAVE, 8000);
+            events.ScheduleEvent(EVENT_BLAST_WAVE, 12000);
+            events.ScheduleEvent(EVENT_MORTAL_STRIKE, 20000);
+            events.ScheduleEvent(EVENT_KNOCK_BACK, 30000);
         }
 
         void EnterCombat(Unit* /*who*/)
@@ -78,45 +82,51 @@ public:
             if (!UpdateVictim())
                 return;
 
-            //Cleave_Timer
-            if (Cleave_Timer <= diff)
-            {
-                DoCast(me->getVictim(), SPELL_CLEAVE);
-                Cleave_Timer = 7000;
-            } else Cleave_Timer -= diff;
-
-            // BlastWave
-            if (BlastWave_Timer <= diff)
-            {
-                DoCast(me->getVictim(), SPELL_BLASTWAVE);
-                BlastWave_Timer = urand(8000, 16000);
-            } else BlastWave_Timer -= diff;
+            if (EnterEvadeIfOutOfCombatArea(diff))
+                Talk(SAY_LEASH);
 
-            //MortalStrike_Timer
-            if (MortalStrike_Timer <= diff)
-            {
-                DoCast(me->getVictim(), SPELL_MORTALSTRIKE);
-                MortalStrike_Timer = urand(25000, 35000);
-            } else MortalStrike_Timer -= diff;
+            if (me->HasUnitState(UNIT_STATE_CASTING))
+                return;
 
-            if (KnockBack_Timer <= diff)
+            while (uint32 eventId = events.ExecuteEvent())
             {
-                if (Unit* target = me->getVictim())
+                switch (eventId)
                 {
-                    DoCast(target, SPELL_KNOCKBACK);
-                    // Drop 50% aggro
-                    if (DoGetThreat(target))
-                        DoModifyThreatPercent(target, -50);
+                    case EVENT_CLEAVE:
+                        DoCastVictim(SPELL_CLEAVE);
+                        events.ScheduleEvent(EVENT_CLEAVE, 8000);
+                        break;
+                    case EVENT_MORTAL_STRIKE:
+                        DoCastVictim(SPELL_MORTAL_STRIKE);
+                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, 20000);
+                        break;
+                    case EVENT_BLAST_WAVE:
+                        DoCastVictim(SPELL_BLAST_WAVE);
+                        events.ScheduleEvent(EVENT_BLAST_WAVE, 12000);
+                        break;
+                    case EVENT_KNOCK_BACK:
+                        if (Unit* target = me->getVictim())
+                        {
+                            DoCast(target, SPELL_BLAST_WAVE);
+                            // Drop 50% of threat
+                            if (DoGetThreat(target))
+                                DoModifyThreatPercent(target, -50);
+                        }
+                        events.ScheduleEvent(EVENT_KNOCK_BACK, 30000);
+                        break;
+                    default:
+                        break;
                 }
-
-                KnockBack_Timer = urand(15000, 30000);
-            } else KnockBack_Timer -= diff;
+            }
 
             if (EnterEvadeIfOutOfCombatArea(diff))
                 Talk(SAY_LEASH);
 
             DoMeleeAttackIfReady();
         }
+
+        private:
+            EventMap events; /// @todo: change BWL to instance script and bosses to BossAI
     };
 };
 
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 96293c635d6..14321873b0d 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -102,10 +102,8 @@ public:
         npc_unworthy_initiateAI(Creature* creature) : ScriptedAI(creature)
         {
             me->SetReactState(REACT_PASSIVE);
-            if (!me->GetEquipmentId())
-                if (const CreatureTemplate* info = sObjectMgr->GetCreatureTemplate(28406))
-                    if (info->equipmentId)
-                        const_cast<CreatureTemplate*>(me->GetCreatureTemplate())->equipmentId = info->equipmentId;
+            if (!me->GetCurrentEquipmentId())
+                me->SetCurrentEquipmentId(me->GetOriginalEquipmentId());
         }
 
         uint64 playerGUID;
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index f508266434b..7e2515c42a7 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -237,7 +237,7 @@ public:
                 case 2:
                     me->SetStandState(UNIT_STAND_STATE_STAND);
                     DoCast(me, SPELL_KOLTIRA_TRANSFORM);
-                    me->LoadEquipment(me->GetEquipmentId());
+                    me->LoadEquipment();
                     break;
                 case 3:
                     SetEscortPaused(true);