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

Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp

10 files changed, 70 insertions, 92 deletions

diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
index b23d0cdaa3c..6c5f4ff3b53 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
@@ -64,7 +64,14 @@ public:
 
     struct instance_blackfathom_deeps_InstanceMapScript : public InstanceScript
     {
-        instance_blackfathom_deeps_InstanceMapScript(Map* map) : InstanceScript(map) { }
+        instance_blackfathom_deeps_InstanceMapScript(Map* map) : InstanceScript(map)
+        {
+            SetHeaders(DataHeader);
+            memset(&encounter, 0, sizeof(encounter));
+
+            countFires = 0;
+            deathTimes = 0;
+        }
 
         ObjectGuid twilightLordKelrisGUID;
         ObjectGuid shrine1GUID;
@@ -79,15 +86,6 @@ public:
         uint8 countFires;
         uint8 deathTimes;
 
-        void Initialize() override
-        {
-            SetHeaders(DataHeader);
-            memset(&encounter, 0, sizeof(encounter));
-
-            countFires = 0;
-            deathTimes = 0;
-        }
-
         void OnCreatureCreate(Creature* creature) override
         {
             switch (creature->GetEntry())
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 71835c3db94..176c24f6707 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -55,19 +55,17 @@ public:
 
     struct instance_mount_hyjal_InstanceMapScript : public InstanceScript
     {
-        instance_mount_hyjal_InstanceMapScript(Map* map) : InstanceScript(map) { }
-
-        void Initialize() override
+        instance_mount_hyjal_InstanceMapScript(Map* map) : InstanceScript(map)
         {
             SetHeaders(DataHeader);
             memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
 
-            RaidDamage         = 0;
-            Trash              = 0;
-            hordeRetreat       = 0;
-            allianceRetreat    = 0;
+            RaidDamage = 0;
+            Trash = 0;
+            hordeRetreat = 0;
+            allianceRetreat = 0;
 
-            ArchiYell          = false;
+            ArchiYell = false;
         }
 
         bool IsEncounterInProgress() const override
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
index 0220ff98750..317ab7e5ad5 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
@@ -52,7 +52,14 @@ public:
 
     struct instance_old_hillsbrad_InstanceMapScript : public InstanceScript
     {
-        instance_old_hillsbrad_InstanceMapScript(Map* map) : InstanceScript(map) { }
+        instance_old_hillsbrad_InstanceMapScript(Map* map) : InstanceScript(map)
+        {
+            SetHeaders(DataHeader);
+            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
+
+            mBarrelCount = 0;
+            mThrallEventCount = 0;
+        }
 
         uint32 m_auiEncounter[MAX_ENCOUNTER];
         uint32 mBarrelCount;
@@ -62,15 +69,6 @@ public:
         ObjectGuid TarethaGUID;
         ObjectGuid EpochGUID;
 
-        void Initialize() override
-        {
-            SetHeaders(DataHeader);
-            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
-
-            mBarrelCount        = 0;
-            mThrallEventCount   = 0;
-        }
-
         Player* GetPlayerInMap()
         {
             Map::PlayerList const& players = instance->GetPlayers();
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
index ed49cc41c39..d46f0b5e9e1 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
@@ -80,7 +80,11 @@ public:
 
     struct instance_the_black_morass_InstanceMapScript : public InstanceScript
     {
-        instance_the_black_morass_InstanceMapScript(Map* map) : InstanceScript(map) { }
+        instance_the_black_morass_InstanceMapScript(Map* map) : InstanceScript(map)
+        {
+            SetHeaders(DataHeader);
+            Clear();
+        }
 
         uint32 m_auiEncounter[EncounterCount];
 
@@ -92,12 +96,6 @@ public:
         ObjectGuid _medivhGUID;
         uint8  _currentRiftId;
 
-        void Initialize() override
-        {
-            SetHeaders(DataHeader);
-            Clear();
-        }
-
         void Clear()
         {
             memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
index 4bbbf26b84e..4af520907e7 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
@@ -43,24 +43,22 @@ public:
 
     struct instance_onyxias_lair_InstanceMapScript : public InstanceScript
     {
-        instance_onyxias_lair_InstanceMapScript(Map* map) : InstanceScript(map) { }
-
-        //Eruption is a BFS graph problem
-        //One map to remember all floor, one map to keep floor that still need to erupt and one queue to know what needs to be removed
-
-        void Initialize() override
+        instance_onyxias_lair_InstanceMapScript(Map* map) : InstanceScript(map)
         {
             SetHeaders(DataHeader);
             SetBossNumber(EncounterCount);
 
-            onyxiaLiftoffTimer       = 0;
-            manyWhelpsCounter        = 0;
-            eruptTimer               = 0;
+            onyxiaLiftoffTimer = 0;
+            manyWhelpsCounter = 0;
+            eruptTimer = 0;
 
             achievManyWhelpsHandleIt = false;
-            achievSheDeepBreathMore  = true;
+            achievSheDeepBreathMore = true;
         }
 
+        //Eruption is a BFS graph problem
+        //One map to remember all floor, one map to keep floor that still need to erupt and one queue to know what needs to be removed
+
         void OnCreatureCreate(Creature* creature) override
         {
             switch (creature->GetEntry())
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
index 8a82f782918..9f2f5edf798 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
@@ -55,16 +55,12 @@ public:
         {
             SetHeaders(DataHeader);
             SetBossNumber(EncounterCount);
-        }
-
-        void Initialize() override
-        {
-            gongWave        = 0;
-            fiendsKilled    = 0;
-            reaversKilled   = 0;
-            summonLowRange  = 0;
+            gongWave = 0;
+            fiendsKilled = 0;
+            reaversKilled = 0;
+            summonLowRange = 0;
             summonHighRange = 0;
-            summonCreature  = 0;
+            summonCreature = 0;
         }
 
         void OnGameObjectCreate(GameObject* gameObject) override
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
index 07cb6e65ee9..6c63dd97406 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
@@ -42,17 +42,15 @@ public:
 
     struct instance_razorfen_kraul_InstanceMapScript : public InstanceScript
     {
-        instance_razorfen_kraul_InstanceMapScript(Map* map) : InstanceScript(map) { }
-
-        ObjectGuid DoorWardGUID;
-        int WardKeeperDeath;
-
-        void Initialize() override
+        instance_razorfen_kraul_InstanceMapScript(Map* map) : InstanceScript(map)
         {
             SetHeaders(DataHeader);
             WardKeeperDeath = 0;
         }
 
+        ObjectGuid DoorWardGUID;
+        int WardKeeperDeath;
+
         Player* GetPlayerInMap()
         {
             Map::PlayerList const& players = instance->GetPlayers();
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
index 456ff749e84..bf37c3d04ff 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
@@ -39,7 +39,17 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript
 
         struct instance_temple_of_ahnqiraj_InstanceMapScript : public InstanceScript
         {
-            instance_temple_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map) { }
+            instance_temple_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map)
+            {
+                SetHeaders(DataHeader);
+                IsBossDied[0] = false;
+                IsBossDied[1] = false;
+                IsBossDied[2] = false;
+
+                BugTrioDeathCount = 0;
+
+                CthunPhase = 0;
+            }
 
             //If Vem is dead...
             bool IsBossDied[3];
@@ -56,18 +66,6 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript
 
             uint32 CthunPhase;
 
-            void Initialize() override
-            {
-                SetHeaders(DataHeader);
-                IsBossDied[0] = false;
-                IsBossDied[1] = false;
-                IsBossDied[2] = false;
-
-                BugTrioDeathCount = 0;
-
-                CthunPhase = 0;
-            }
-
             void OnCreatureCreate(Creature* creature) override
             {
                 switch (creature->GetEntry())
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
index 5d7202588a9..6ca4b7c9f5d 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
@@ -41,14 +41,7 @@ public:
 
     struct instance_wailing_caverns_InstanceMapScript : public InstanceScript
     {
-        instance_wailing_caverns_InstanceMapScript(Map* map) : InstanceScript(map) { }
-
-        uint32 m_auiEncounter[MAX_ENCOUNTER];
-
-        bool yelled;
-        ObjectGuid NaralexGUID;
-
-        void Initialize() override
+        instance_wailing_caverns_InstanceMapScript(Map* map) : InstanceScript(map)
         {
             SetHeaders(DataHeader);
             memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
@@ -56,6 +49,11 @@ public:
             yelled = false;
         }
 
+        uint32 m_auiEncounter[MAX_ENCOUNTER];
+
+        bool yelled;
+        ObjectGuid NaralexGUID;
+
         void OnCreatureCreate(Creature* creature) override
         {
             if (creature->GetEntry() == DATA_NARALEX)
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
index 393028e0446..7b31850caac 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
@@ -108,7 +108,15 @@ public:
 
     struct instance_zulfarrak_InstanceMapScript : public InstanceScript
     {
-        instance_zulfarrak_InstanceMapScript(Map* map) : InstanceScript(map) { }
+        instance_zulfarrak_InstanceMapScript(Map* map) : InstanceScript(map)
+        {
+            SetHeaders(DataHeader);
+            PyramidPhase = 0;
+            major_wave_Timer = 0;
+            minor_wave_Timer = 0;
+            addGroupSize = 0;
+            waypoint = 0;
+        }
 
         uint32 GahzRillaEncounter;
         ObjectGuid ZumrahGUID;
@@ -124,16 +132,6 @@ public:
         uint32 addGroupSize;
         uint32 waypoint;
 
-        void Initialize() override
-        {
-            SetHeaders(DataHeader);
-            PyramidPhase = 0;
-            major_wave_Timer = 0;
-            minor_wave_Timer = 0;
-            addGroupSize = 0;
-            waypoint = 0;
-        }
-
         void OnCreatureCreate(Creature* creature) override
         {
             switch (creature->GetEntry())