diff --git a/sql/AQ/Doors.sql b/sql/AQ/Doors.sql index 82328d1b6..e3182b683 100644 --- a/sql/AQ/Doors.sql +++ b/sql/AQ/Doors.sql @@ -1,7 +1,7 @@ -- Spawn AQ doors DELETE FROM gameobject WHERE guid BETWEEN 21783 AND 21785; INSERT INTO gameobject (guid, id, map, position_x, position_y, position_z, orientation, rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state, spawnFlags) VALUES -(21783, 180634, 531, -8929.61, 1344.38, -104.211, 3.84846, 0, 0, -0.938191, 0.346119, 7200, 100, 0, 0), +(21783, 180634, 531, -8929.61, 1344.38, -104.211, 3.84846, 0, 0, -0.938191, 0.346119, 7200, 100, 1, 0), (21784, 180635, 531, -9016.36, 1330.68, -104.211, 2.80125, 0, 0, 0.985556, 0.169352, 7200, 100, 1, 0), (21785, 180636, 531, -8429.59, 2048.81, 153.309, 3.51685, 0, 0, -0.982449, 0.186529, 7200, 100, 1, 0); diff --git a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp index 8b62adc55..b1a53c754 100644 --- a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp @@ -319,7 +319,8 @@ void instance_temple_of_ahnqiraj::SetData(uint32 uiType, uint32 uiData) case TYPE_SKERAM: m_auiEncounter[uiType] = uiData; if (uiData == DONE) - DoUseDoorOrButton(GO_SKERAM_GATE); + if (GameObject* pGo = GetSingleGameObjectFromStorage(GO_SKERAM_GATE)) + DoUseDoorOrButton(pGo->GetGUID()); break; case TYPE_BUG_TRIO: if (uiData == SPECIAL) @@ -337,7 +338,8 @@ void instance_temple_of_ahnqiraj::SetData(uint32 uiType, uint32 uiData) case TYPE_HUHURAN: m_auiEncounter[uiType] = uiData; if (uiData == DONE) { - DoUseDoorOrButton(GO_TWINS_ENTER_DOOR); + if (GameObject* pGo = GetSingleGameObjectFromStorage(GO_TWINS_ENTER_DOOR)) + DoUseDoorOrButton(pGo->GetGUID()); if (Creature* pCreature = GetSingleCreatureFromStorage(NPC_MASTERS_EYE)) { //pCreature->NearLandTo(pCreature->GetPositionX(), pCreature->GetPositionY(), -102.0f, 4.896f); } @@ -386,9 +388,11 @@ void instance_temple_of_ahnqiraj::SetData(uint32 uiType, uint32 uiData) return; m_auiEncounter[uiType] = uiData; - DoUseDoorOrButton(GO_TWINS_ENTER_DOOR); + if (GameObject* pGo = GetSingleGameObjectFromStorage(GO_TWINS_ENTER_DOOR)) + DoUseDoorOrButton(pGo->GetGUID()); if (uiData == DONE) { - DoUseDoorOrButton(GO_TWINS_EXIT_DOOR); + if (GameObject* pGo = GetSingleGameObjectFromStorage(GO_TWINS_EXIT_DOOR)) + DoUseDoorOrButton(pGo->GetGUID()); m_twinsDeadDialogue.StartNextDialogueText(SAY_VEKNILASH_DEATH); } break;