From 0d0e3a6ce1d7d14cd4719186593adc39cc1ca8f4 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Thu, 5 Dec 2024 05:17:18 -0300 Subject: [PATCH] fix(Scripts/ZulAman): Zul'jin gate should be unlocked instead auto open (#20841) --- .../scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp | 7 ++++++- src/server/scripts/EasternKingdoms/ZulAman/zulaman.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index bfc5ddf2f..f86186b40 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -53,7 +53,6 @@ DoorData const doorData[] = { GO_DOOR_HALAZZI, DATA_HALAZZI, DOOR_TYPE_PASSAGE }, { GO_LYNX_TEMPLE_ENTRANCE, DATA_HALAZZI, DOOR_TYPE_ROOM }, { GO_DOOR_AKILZON, DATA_AKILZON, DOOR_TYPE_ROOM }, - { GO_GATE_ZULJIN, DATA_HEXLORD, DOOR_TYPE_PASSAGE }, { 0, 0, DOOR_TYPE_ROOM } // END }; @@ -71,6 +70,7 @@ ObjectData const gameObjectData[] = { GO_STRANGE_GONG, DATA_STRANGE_GONG }, { GO_MASSIVE_GATE, DATA_MASSIVE_GATE }, { GO_GATE_HEXLORD, DATA_HEXLORD_GATE }, + { GO_GATE_ZULJIN, DATA_ZULJIN_GATE }, { 0, 0 } }; @@ -290,6 +290,11 @@ public: HandleGameObject(ObjectGuid::Empty, false, GetGameObject(DATA_HEXLORD_GATE)); else if (state == NOT_STARTED) CheckInstanceStatus(); + else if (state == DONE) + { + if (GameObject* zuljinGate = GetGameObject(DATA_ZULJIN_GATE)) + zuljinGate->RemoveGameObjectFlag(GO_FLAG_LOCKED); + } break; } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h index f0f86ad0b..8ed6eb131 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h @@ -41,6 +41,7 @@ enum DataTypes DATA_HARRISON_JONES = 13, TYPE_AKILZON_GAUNTLET = 14, DATA_LOOKOUT = 15, + DATA_ZULJIN_GATE = 16 }; enum CreatureIds