From 1e7f74141643c4e553646b299ee2f379e6c8ddc7 Mon Sep 17 00:00:00 2001
From: CraftedRO <24683355+CraftedRO@users.noreply.github.com>
Date: Sun, 9 Mar 2025 16:23:54 +0200
Subject: [PATCH] Scripts/Scarlet Monastery: Do not start path for
 npc_scarlet_trainee if combat (#30709)

---
 .../scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index 81219de4fe0..afc58dcfc35 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -134,7 +134,7 @@ struct npc_scarlet_trainee : public EscortAI
 
     void UpdateAI(uint32 diff) override
     {
-        if (_startTimer)
+        if (_startTimer && !me->IsInCombat())
         {
             if (_startTimer <= diff)
             {