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

Conflicts:
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp

6 files changed, 14 insertions, 29 deletions

diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index d86c9a2afe7..4a4304bcd24 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -72,7 +72,7 @@ enum Spells
     // Ashtongue Spiritbinder
     SPELL_SPIRIT_MEND                = 42025,
     SPELL_CHAIN_HEAL                 = 42027,
-    SPELL_SPIRIT_HEAL                = 42317
+    SPELL_SPIRITBINDER_SPIRIT_HEAL   = 42317
 };
 
 enum Creatures
@@ -1189,7 +1189,7 @@ public:
                 switch (eventId)
                 {
                     case EVENT_SPIRIT_HEAL:
-                        DoCast(me, SPELL_SPIRIT_HEAL);
+                        DoCast(me, SPELL_SPIRITBINDER_SPIRIT_HEAL);
                         events.ScheduleEvent(EVENT_SPIRIT_HEAL, urand (13000, 16000));
                         break;
                     default:
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index 808ab7c7da9..0dbd21ff94a 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -113,7 +113,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
                     instance->SetBossState(DATA_NETHEKURSE, DONE);
             }
 
-            void SetData(uint32 data, uint32 value)
+            void SetData(uint32 data, uint32 value) OVERRIDE
             {
                 if (data != SETDATA_DATA)
                     return;
@@ -340,9 +340,9 @@ class npc_fel_orc_convert : public CreatureScript
                 {
                     if (instance->GetBossState(DATA_NETHEKURSE) != IN_PROGRESS)
                         return;
-                    if (instance->GetData64(NPC_GRAND_WARLOCK_NETHEKURSE))
-                        if (Creature* Kurse = Unit::GetCreature(*me, instance->GetData64(NPC_GRAND_WARLOCK_NETHEKURSE)))
-                            Kurse->AI()->SetData(SETDATA_DATA, SETDATA_PEON_DEATH);
+
+                    if (Creature* Kurse = Unit::GetCreature(*me, instance->GetData64(NPC_GRAND_WARLOCK_NETHEKURSE)))
+                        Kurse->AI()->SetData(SETDATA_DATA, SETDATA_PEON_DEATH);
                 }
             }
 
@@ -404,4 +404,3 @@ void AddSC_boss_grand_warlock_nethekurse()
     new npc_fel_orc_convert();
     new npc_lesser_shadow_fissure();
 }
-
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
index 9c32e459b9a..9c4be7c0b1b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -447,4 +447,3 @@ void AddSC_boss_warbringer_omrogg()
     new boss_warbringer_omrogg();
     new npc_omrogg_heads();
 }
-
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
index 87b94deb552..f9ec3edb362 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
@@ -319,4 +319,3 @@ void AddSC_boss_warchief_kargath_bladefist()
 {
     new boss_warchief_kargath_bladefist();
 }
-
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
index 3328d5c900d..362b8e729ef 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -49,7 +49,7 @@ class instance_shattered_halls : public InstanceMapScript
                 nethekurseDoor2GUID = 0;
             }
 
-            void OnGameObjectCreate(GameObject* go)
+            void OnGameObjectCreate(GameObject* go) OVERRIDE
             {
                 switch (go->GetEntry())
                 {
@@ -62,7 +62,7 @@ class instance_shattered_halls : public InstanceMapScript
                 }
             }
 
-            void OnCreatureCreate(Creature* creature)
+            void OnCreatureCreate(Creature* creature) OVERRIDE
             {
                 switch (creature->GetEntry())
                 {
@@ -72,7 +72,7 @@ class instance_shattered_halls : public InstanceMapScript
                 }
             }
 
-            bool SetBossState(uint32 type, EncounterState state)
+            bool SetBossState(uint32 type, EncounterState state) OVERRIDE
             {
                 if (!InstanceScript::SetBossState(type, state))
                     return false;
@@ -168,4 +168,3 @@ void AddSC_instance_shattered_halls()
 {
     new instance_shattered_halls();
 }
-
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index 389634a50bf..09fb235edb9 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -75,11 +75,8 @@ enum WaitEventType
 class boss_alar : public CreatureScript
 {
     public:
+        boss_alar() : CreatureScript("boss_alar") { }
 
-        boss_alar()
-            : CreatureScript("boss_alar")
-        {
-        }
         struct boss_alarAI : public ScriptedAI
         {
             boss_alarAI(Creature* creature) : ScriptedAI(creature)
@@ -162,7 +159,6 @@ class boss_alar : public CreatureScript
 
             void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {}
 
-
             void AttackStart(Unit* who) OVERRIDE
             {
                 if (Phase1)
@@ -462,11 +458,7 @@ class boss_alar : public CreatureScript
 class npc_ember_of_alar : public CreatureScript
 {
     public:
-
-        npc_ember_of_alar()
-            : CreatureScript("npc_ember_of_alar")
-        {
-        }
+        npc_ember_of_alar() : CreatureScript("npc_ember_of_alar") { }
 
         struct npc_ember_of_alarAI : public ScriptedAI
         {
@@ -484,10 +476,12 @@ class npc_ember_of_alar : public CreatureScript
             {
                 toDie = false;
             }
+
             void EnterCombat(Unit* /*who*/) OVERRIDE
             {
                 DoZoneInCombat();
             }
+
             void EnterEvadeMode() OVERRIDE
             {
                 me->setDeathState(JUST_DIED);
@@ -541,11 +535,7 @@ class npc_ember_of_alar : public CreatureScript
 class npc_flame_patch_alar : public CreatureScript
 {
     public:
-
-        npc_flame_patch_alar()
-            : CreatureScript("npc_flame_patch_alar")
-        {
-        }
+        npc_flame_patch_alar() : CreatureScript("npc_flame_patch_alar") { }
 
         struct npc_flame_patch_alarAI : public ScriptedAI
         {
@@ -570,4 +560,3 @@ void AddSC_boss_alar()
     new npc_ember_of_alar();
     new npc_flame_patch_alar();
 }
-