From f0a96b4489ec5a348c64aeb675020f1d9e1a033d Mon Sep 17 00:00:00 2001
From: Johaine <32821455+Johaine@users.noreply.github.com>
Date: Wed, 2 Aug 2023 17:52:18 +0000
Subject: [PATCH] fix(Scripts/EscapeFromDurnholde): Fix escort mission getting
 stuck (#16636)

Fix stuck event

Fix escort event possibly getting stuck by preventing
DATA_ESCORT_PROGRESS from being decreased
---
 .../EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
index b0c0f0e53..b771a3bce 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
@@ -66,7 +66,7 @@ public:
 
         void OnPlayerEnter(Player* player) override
         {
-            if (instance->GetPlayersCountExceptGMs() == 1)
+            if (instance->GetPlayersCountExceptGMs() <= 1)
                 CleanupInstance();
 
             EnsureGridLoaded();
@@ -144,8 +144,11 @@ public:
                         Reposition(thrall);
                     return;
                 case DATA_ESCORT_PROGRESS:
-                    _encounterProgress = data;
-                    SaveToDB();
+                    if (_encounterProgress < data)
+                    {
+                        _encounterProgress = data;
+                        SaveToDB();
+                    }
                     break;
                 case DATA_BOMBS_PLACED:
                     {