From 80a8f6d47a8a48869de197ed95c23b80c0999476 Mon Sep 17 00:00:00 2001
From: Skjalf <47818697+Nyeriah@users.noreply.github.com>
Date: Sun, 20 Aug 2023 15:46:39 -0300
Subject: [PATCH] fix(Scripts/OHF): Don't update the escort steps when Drake
 dies (#17024)

* fix(Scripts/OHF): Don't update the escort steps when Drake dies

* update gossip req

* Update rev_1692233536025387200.sql
---
 data/sql/updates/pending_db_world/rev_1692233536025387200.sql | 2 ++
 .../EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp         | 4 ----
 .../CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp   | 1 -
 .../CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h     | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)
 create mode 100644 data/sql/updates/pending_db_world/rev_1692233536025387200.sql

diff --git a/data/sql/updates/pending_db_world/rev_1692233536025387200.sql b/data/sql/updates/pending_db_world/rev_1692233536025387200.sql
new file mode 100644
index 000000000..0b5ce8ce9
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1692233536025387200.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `conditions` SET `ConditionValue1` = 1, `ConditionValue1` = 3, `ConditionValue3` = 2, `Comment` = 'Require Lt. Drake encounter complete' WHERE `ConditionValue2` = 2 AND `SourceTypeOrReferenceId` = 14 AND `SourceGroup` = 7499 AND `SourceEntry` = 9090;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
index afa6f6eb8..196393abd 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
@@ -112,10 +112,6 @@ struct boss_lieutenant_drake : public BossAI
     {
         _JustDied();
         Talk(SAY_DEATH);
-        if (InstanceScript* instance = me->GetInstanceScript())
-        {
-            instance->SetData(DATA_ESCORT_PROGRESS, ENCOUNTER_PROGRESS_DRAKE_KILLED);
-        }
     }
 
     void MovementInform(uint32 type, uint32 point) override
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
index 26a6bdd12..5d698d960 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
@@ -258,7 +258,6 @@ public:
             switch (param)
             {
                 case ENCOUNTER_PROGRESS_BARRELS:
-                case ENCOUNTER_PROGRESS_DRAKE_KILLED:
                     events.ScheduleEvent(EVENT_OPEN_DOORS, 0);
                     events.ScheduleEvent(EVENT_START_WP, 3000);
                     break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
index 343453a0b..57a692b1a 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
@@ -74,7 +74,7 @@ enum MiscIds
 
     ENCOUNTER_PROGRESS_NONE             = 0,
     ENCOUNTER_PROGRESS_BARRELS          = 1,
-    ENCOUNTER_PROGRESS_DRAKE_KILLED     = 2,
+    //ENCOUNTER_PROGRESS_DRAKE_KILLED     = 2, No longer used. Kept as reference as DB might rely on the existing order.
     ENCOUNTER_PROGRESS_THRALL_ARMORED   = 3,
     ENCOUNTER_PROGRESS_AMBUSHES_1       = 4,
     ENCOUNTER_PROGRESS_SKARLOC_KILLED   = 5,