From a304a60c7af7fd8c25639274c27a210a18d67e76 Mon Sep 17 00:00:00 2001 From: Meji Date: Fri, 18 Apr 2025 14:48:09 +0200 Subject: Core/SAI: Allow SMART_EVENT_HEALTH_PCT to be triggered out of combat (#30874) (cherry picked from commit 1248bdffcb13f846fa42c6aee77cea685c756e51) --- src/server/game/AI/SmartScripts/SmartScript.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index aa7ca934d9b..f7ae168fcaf 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -3136,7 +3136,7 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui break; case SMART_EVENT_HEALTH_PCT: { - if (!me || !me->IsEngaged() || !me->GetMaxHealth()) + if (!me || me->IsInEvadeMode() || !me->GetMaxHealth()) return; uint32 perc = (uint32)me->GetHealthPct(); if (perc > e.event.minMaxRepeat.max || perc < e.event.minMaxRepeat.min) @@ -3544,7 +3544,7 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui } case SMART_EVENT_FRIENDLY_HEALTH_PCT: { - if (!me || !me->IsEngaged()) + if (!me || me->IsInEvadeMode()) return; Unit* unitTarget = nullptr; -- cgit v1.2.3