Fix Zul Aman

src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp

@@ -143,7 +143,9 @@ class boss_nalorakk : public CreatureScript
                     waitTimer = 0;
                     me->SetSpeed(MOVE_RUN, 2);
                     me->SetWalk(false);
-                }else
+                    ResetMobs();
+                }
+                else
                 {
                     (*me).GetMotionMaster()->MovePoint(0, NalorakkWay[7][0], NalorakkWay[7][1], NalorakkWay[7][2]);
                 }
@@ -160,6 +162,33 @@ class boss_nalorakk : public CreatureScript
                 // me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, 5122);  /// @todo find the correct equipment id
             }
 
+            void ResetMobs()
+            {
+                std::list<Creature*> templist;
+                float x, y, z;
+                me->GetPosition(x, y, z);
+
+                {
+                    CellCoord pair(Trinity::ComputeCellCoord(x, y));
+                    Cell cell(pair);
+                    cell.SetNoCreate();
+
+                    Trinity::AllFriendlyCreaturesInGrid check(me);
+                    Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid> searcher(me, templist, check);
+
+                    TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllFriendlyCreaturesInGrid>, GridTypeMapContainer> cSearcher(searcher);
+
+                    cell.Visit(pair, cSearcher, *(me->GetMap()), *me, me->GetGridActivationRange());
+                }
+
+                if (templist.empty())
+                    return;
+
+                for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end(); ++i)
+                    if ((*i) && me->IsWithinDistInMap((*i), 25))
+                        (*i)->AI()->Reset();
+            }
+
             void SendAttacker(Unit* target)
             {
                 std::list<Creature*> templist;
@@ -283,6 +312,7 @@ class boss_nalorakk : public CreatureScript
 
             void JustDied(Unit* /*killer*/)
             {
+                ResetMobs();
                 instance->SetData(DATA_NALORAKKEVENT, DONE);
 
                 me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, NULL);

src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp

@@ -252,6 +252,7 @@ class instance_zulaman : public InstanceMapScript
                                 DoUpdateWorldState(WORLDSTATE_TIME_TO_SACRIFICE, QuestMinute);
                             }
                             SummonHostage(0);
+                            SaveToDB();
                         }
                         break;
                     case DATA_AKILZONEVENT:
@@ -265,17 +266,20 @@ class instance_zulaman : public InstanceMapScript
                                 DoUpdateWorldState(WORLDSTATE_TIME_TO_SACRIFICE, QuestMinute);
                             }
                             SummonHostage(1);
+                            SaveToDB();
                         }
                         break;
                     case DATA_JANALAIEVENT:
                         m_auiEncounter[DATA_JANALAIEVENT] = data;
                         if (data == DONE)
                             SummonHostage(2);
+                        SaveToDB();
                         break;
                     case DATA_HALAZZIEVENT:
                         m_auiEncounter[DATA_HALAZZIEVENT] = data;
                         HandleGameObject(HalazziDoorGUID, data != IN_PROGRESS);
                         if (data == DONE) SummonHostage(3);
+                        SaveToDB();
                         break;
                     case DATA_HEXLORDEVENT:
                         m_auiEncounter[DATA_HEXLORDEVENT] = data;
@@ -283,10 +287,12 @@ class instance_zulaman : public InstanceMapScript
                             HandleGameObject(HexLordGateGUID, false);
                         else if (data == NOT_STARTED)
                             CheckInstanceStatus();
+                        SaveToDB();
                         break;
                     case DATA_ZULJINEVENT:
                         m_auiEncounter[DATA_ZULJINEVENT] = data;
                         HandleGameObject(ZulJinDoorGUID, data != IN_PROGRESS);
+                        SaveToDB();
                         break;
                     case DATA_CHESTLOOTED:
                         ++ChestLooted;