From 381c543c60a1394122af6e1130fb1278e98b0fe0 Mon Sep 17 00:00:00 2001 From: Keader Date: Sat, 30 Oct 2021 11:08:56 -0300 Subject: Core/Unit: Fixed wrong combat stop when set charm (cherry picked from commit 9b354c6bebdf9fe9c9842330447162edc63cc751) --- src/server/game/Entities/Unit/Unit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 4bcf5e101ef..d72bdd264d8 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11068,7 +11068,7 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au } CastStop(); - CombatStop(); /// @todo CombatStop(true) may cause crash (interrupt spells) + AttackStop(); Player* playerCharmer = charmer->ToPlayer(); -- cgit v1.2.3