From 462e11c96f6cb3a59fea4dc164886a421db11e52 Mon Sep 17 00:00:00 2001
From: Kelno <kelno@users.noreply.github.com>
Date: Mon, 30 Aug 2021 11:27:51 +0200
Subject: Remove combo points on a creature when it evades (#26836)

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

(limited to 'src')

diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 08f98a3aa68..bb8621bcea2 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -303,7 +303,7 @@ bool CreatureAI::_EnterEvadeMode(EvadeReason /*why*/)
     }
 
     me->RemoveAurasOnEvade();
-
+    me->ClearComboPointHolders(); // Remove all combo points targeting this unit
     me->CombatStop(true);
     me->LoadCreaturesAddon();
     me->SetLootRecipient(nullptr);
-- 
cgit v1.2.3