aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/AI/CreatureAI.cpp
diff options
context:
space:
mode:
authorModoX <moardox@gmail.com>2024-12-29 09:04:40 +0100
committerOvahlord <dreadkiller@gmx.de>2024-12-29 12:18:13 +0100
commit34bd46ae5c01f4d7f3fcb9aa08ad68350bdeaae3 (patch)
tree29835637c66a518697d0e63ea45a3d7d830f118d /src/server/game/AI/CreatureAI.cpp
parentcfc13bc2806857f4c1511221cf479ee09a248c20 (diff)
Core/Creature: Implement aggro grace period (#30362)
Ref: #26528 #30273 #23258 (cherry picked from commit 26d1337461114506ca57e2265d3dc5e96fd08f82)
Diffstat (limited to 'src/server/game/AI/CreatureAI.cpp')
-rw-r--r--src/server/game/AI/CreatureAI.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 9130e10bf13..a31455d5c09 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -124,7 +124,7 @@ void CreatureAI::MoveInLineOfSight(Unit* who)
if (me->IsEngaged())
return;
- if (me->HasReactState(REACT_AGGRESSIVE) && me->CanStartAttack(who, false))
+ if (me->HasReactState(REACT_AGGRESSIVE) && me->CanStartAttack(who, false) && (me->IsAggroGracePeriodExpired() || me->GetMap()->Instanceable()))
me->EngageWithTarget(who);
}