From 3b58c9afad86bc550946d454b0eafdc4db5b94f5 Mon Sep 17 00:00:00 2001
From: mpfans <mpfans@vip.qq.com>
Date: Mon, 25 May 2026 05:33:23 +0800
Subject: [PATCH] fix(Scripts/Kalimdor): prevent starting Caravan escort when
 in progress (#25776)

---
 src/server/scripts/Kalimdor/zone_desolace.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp
index 649b4adea..e89b17754 100644
--- a/src/server/scripts/Kalimdor/zone_desolace.cpp
+++ b/src/server/scripts/Kalimdor/zone_desolace.cpp
@@ -395,9 +395,12 @@ public:
                         active->RemoveNpcFlag(UNIT_NPC_FLAG_QUESTGIVER);
                     break;
                 case EVENT_RESTART_ESCORT:
-                    CheckCaravan();
-                    SetDespawnAtEnd(false);
-                    Start(true, ObjectGuid::Empty, 0, false, false, true);
+                    if (!IsEscorted())
+                    {
+                        CheckCaravan();
+                        SetDespawnAtEnd(false);
+                        Start(true, ObjectGuid::Empty, 0, false, false, true);
+                    }
                     break;
             }