From f6f18cb5386fbe9afc0059bd4f0d61a566394e7f Mon Sep 17 00:00:00 2001
From: Kitzunu <24550914+Kitzunu@users.noreply.github.com>
Date: Fri, 17 Sep 2021 13:42:04 +0200
Subject: [PATCH] fix(Core/Creature): remove combo points on evade (#7861)

---
 src/server/game/AI/CreatureAI.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 09173c063..39925b2b7 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -296,6 +296,7 @@ bool CreatureAI::_EnterEvadeMode()
     // don't remove clone caster on evade (to be verified)
     me->RemoveEvadeAuras();
 
+    me->ClearComboPointHolders(); // Remove all combo points targeting this unit
     // sometimes bosses stuck in combat?
     me->DeleteThreatList();
     me->CombatStop(true);