Merge commit 'a2ba49afa428ed9297f98bf8a5e00f6f7a6f4c3a' into 4.3.4

2 files changed, 13 insertions, 8 deletions

diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
index 3c8e06b59a9..62c85491a20 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -131,16 +131,11 @@ public:
     {
         boss_onyxiaAI(Creature* creature) : BossAI(creature, DATA_ONYXIA)
         {
-            Reset();
+            Initialize();
         }
 
-        void Reset() override
+        void Initialize()
         {
-            if (!IsCombatMovementAllowed())
-                SetCombatMovement(true);
-
-            _Reset();
-
             Phase = PHASE_START;
             MovePoint = urand(0, 5);
             PointData = GetMoveData();
@@ -148,6 +143,16 @@ public:
             triggerGUID = 0;
             tankGUID = 0;
             IsMoving = false;
+        }
+
+        void Reset() override
+        {
+            Initialize();
+
+            if (!IsCombatMovementAllowed())
+                SetCombatMovement(true);
+
+            _Reset();
 
             instance->SetData(DATA_ONYXIA_PHASE, Phase);
             instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
index 9fd73f7a977..c31988843fe 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
@@ -37,7 +37,7 @@ enum Data32
 enum Data64
 {
     DATA_ONYXIA_GUID            = 0,
-    DATA_FLOOR_ERUPTION_GUID    = 1,
+    DATA_FLOOR_ERUPTION_GUID    = 1
 };
 
 enum OnyxiaPhases