Merge branch '6.x' into Spells

Conflicts:
	src/server/game/DataStores/DBCStores.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/scripts/Spells/spell_druid.cpp

5 files changed, 20 insertions, 9 deletions

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index dc319332b6b..a0ff40c8a3c 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -283,6 +283,8 @@ public:
 
             SoulChargeCount = 0;
             WispCount = 0;                                      // When ~30 wisps are summoned, Archimonde dies               
+            _unleashSpell = 0;
+            _chargeSpell = 0;
 
             Enraged = false;
             HasProtected = false;
diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
index 9b8b435e93c..386f80c0c64 100644
--- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
+++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
@@ -484,7 +484,7 @@ class npc_egg_pile : public CreatureScript
 
         private:
             EventMap _events;
-            uint32 _callHatchlingSpell;
+            uint32 _callHatchlingSpell = 0;
         };
 
         CreatureAI* GetAI(Creature* creature) const override
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
index e5f24d37a30..38b587eacf7 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
@@ -80,7 +80,17 @@ public:
 
     struct boss_temple_guardian_anhuurAI : public BossAI
     {
-        boss_temple_guardian_anhuurAI(Creature* creature) : BossAI(creature, DATA_TEMPLE_GUARDIAN_ANHUUR) { }
+        boss_temple_guardian_anhuurAI(Creature* creature) : BossAI(creature, DATA_TEMPLE_GUARDIAN_ANHUUR)
+        {
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            _phase = PHASE_FIRST_SHIELD;
+            _oldPhase = PHASE_FIRST_SHIELD;
+            _beacons = 0;
+        }
 
         void CleanStalkers()
         {
@@ -95,9 +105,7 @@ public:
 
         void Reset() override
         {
-            _phase = PHASE_FIRST_SHIELD;
-            _oldPhase = PHASE_FIRST_SHIELD;
-            _beacons = 0;
+            Initialize();
             _Reset();
             CleanStalkers();
             me->RemoveAurasDueToSpell(SPELL_SHIELD_OF_LIGHT);
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
index 4377344fb26..30a0e2441fb 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
@@ -65,6 +65,7 @@ class instance_halls_of_origination : public InstanceMapScript
                 {
                     case GO_ANHUURS_BRIDGE:
                         AnhuursBridgeGUID = go->GetGUID();
+                        // no break
                     case GO_DOODAD_ULDUM_ELEVATOR_COL01:
                     case GO_VAULT_OF_LIGHTS_DOOR:
                     case GO_DOODAD_ULDUM_LIGHTMACHINE_01:
diff --git a/src/server/scripts/Kalimdor/zone_felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp
index e4d5925c950..9f02e14220e 100644
--- a/src/server/scripts/Kalimdor/zone_felwood.cpp
+++ b/src/server/scripts/Kalimdor/zone_felwood.cpp
@@ -51,7 +51,7 @@ public:
 
         void Reset() override
         {
-            lasher_clicked = false;
+            lasherClicked = false;
         }
 
         void OnSpellClick(Unit* clicker, bool& result) override
@@ -74,7 +74,7 @@ public:
             me->CastSpell(me, SPELL_STAND);
             me->GetMotionMaster()->MoveRandom(8.0f);
             events.ScheduleEvent(EVENT_CHECK_OOC, 20000);
-            lasher_clicked = true;
+            lasherClicked = true;
 
             if (Player* player = clicker->ToPlayer())
                 player->KilledMonsterCredit(NPC_WHISPERWIND_LASHER);
@@ -82,7 +82,7 @@ public:
 
         void UpdateAI(uint32 diff) override
         {
-            if (!lasher_clicked)
+            if (!lasherClicked)
                 return;
 
             events.Update(diff);
@@ -104,7 +104,7 @@ public:
 
     private:
         EventMap events;
-        bool lasher_clicked;
+        bool lasherClicked = false;
     };
 
     CreatureAI* GetAI(Creature* creature) const override