aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKeader <keader.android@gmail.com>2021-10-30 11:08:56 -0300
committerShauren <shauren.trinity@gmail.com>2022-03-20 23:50:55 +0100
commit381c543c60a1394122af6e1130fb1278e98b0fe0 (patch)
tree3b9872aaee31db747dc12530a195266f4c86002e /src
parente2d84db3d088acc1d7d433121747e1d721971cec (diff)
Core/Unit: Fixed wrong combat stop when set charm
(cherry picked from commit 9b354c6bebdf9fe9c9842330447162edc63cc751)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp2
1 files changed, 1 insertions, 1 deletions
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();