Merge remote-tracking branch 'origin/master' into 4.3.4

2 files changed, 4 insertions, 2 deletions

diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index c7d6e2fb6e4..068d00f550f 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -80,7 +80,9 @@ class boss_akilzon : public CreatureScript
             boss_akilzonAI(Creature* creature) : ScriptedAI(creature)
             {
                 instance = creature->GetInstanceScript();
+                memset(BirdGUIDs, 0, sizeof(BirdGUIDs));
             }
+
             InstanceScript* instance;
 
             uint64 BirdGUIDs[8];
@@ -116,8 +118,7 @@ class boss_akilzon : public CreatureScript
                 CloudGUID = 0;
                 CycloneGUID = 0;
                 DespawnSummons();
-                for (uint8 i = 0; i < 8; ++i)
-                    BirdGUIDs[i] = 0;
+                memset(BirdGUIDs, 0, sizeof(BirdGUIDs));
 
                 StormCount = 0;
                 StormSequenceTimer = 0;
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
index ecf173b02e5..a8afd19cd96 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
@@ -109,6 +109,7 @@ class boss_halazzi : public CreatureScript
                 if (instance)
                     instance->SetData(DATA_HALAZZIEVENT, NOT_STARTED);
 
+                LynxGUID = 0;
                 TransformCount = 0;
                 BerserkTimer = 600000;
                 CheckTimer = 1000;