aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCraftedRO <24683355+CraftedRO@users.noreply.github.com>2025-03-09 16:23:54 +0200
committerGitHub <noreply@github.com>2025-03-09 15:23:54 +0100
commit1e7f74141643c4e553646b299ee2f379e6c8ddc7 (patch)
treeefa968d1c63f873f46bc07037090b2f4b67bdc1a /src
parent059b1b3cf26f18a6d4c6ac9581c17afcc4752526 (diff)
Scripts/Scarlet Monastery: Do not start path for npc_scarlet_trainee if combat (#30709)
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp2
1 files changed, 1 insertions, 1 deletions
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)
{