修复祖阿曼开门的若干问题

kissingers · Jun 8, 2024 · bd56f90 · bd56f90
1 parent 659e859
commit bd56f90
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
@@ -156,6 +156,8 @@ class instance_zulaman : public InstanceMapScript
             {
                 case GO_DOOR_HALAZZI:
                     HalazziDoorGUID = go->GetGUID();
+                    if (GetBossState(DATA_HALAZZIEVENT) == DONE)
+                        go->SetGoState(GO_STATE_ACTIVE);
                     break;
                 case GO_GATE_ZULJIN:
                     ZulJinGateGUID = go->GetGUID();
@@ -216,10 +218,10 @@ class instance_zulaman : public InstanceMapScript
 
         void CheckInstanceStatus()
         {
-            if (BossKilled >= DATA_HALAZZIEVENT)
+            if (BossKilled > DATA_HALAZZIEVENT)     //chang >= to > because first door gate is a ext boss
                 HandleGameObject(HexLordGateGUID, true);
 
-            if (BossKilled >= DATA_HEXLORDEVENT)
+            if (BossKilled > DATA_HEXLORDEVENT)
                 HandleGameObject(ZulJinGateGUID, true);
         }
 
@@ -302,8 +304,12 @@ class instance_zulaman : public InstanceMapScript
                     break;
                 case DATA_HALAZZIEVENT:
                     m_auiEncounter[DATA_HALAZZIEVENT] = data;
-                    HandleGameObject(HalazziDoorGUID, data != IN_PROGRESS);
-                    if (data == DONE) SummonHostage(3);
+                    //HandleGameObject(HalazziDoorGUID, data != IN_PROGRESS);
+                    if (data == DONE)
+                    {
+                        SummonHostage(3);
+                        HandleGameObject(HalazziDoorGUID, true);
+                    }
                     SaveToDB();
                     break;
                 case DATA_HEXLORDEVENT:

diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
@@ -52,7 +52,7 @@ enum CreatureIds
 enum GameobjectIds
 {
     GO_DOOR_HALAZZI                     = 186303,
-    GO_GATE_ZULJIN                      = 186304,
+    GO_GATE_ZULJIN                      = 186306,
     GO_GATE_HEXLORD                     = 186305,
     GO_MASSIVE_GATE                     = 186728,
     GO_DOOR_AKILZON                     = 186858,