aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLucas Nascimento <keader.android@gmail.com>2021-10-17 17:02:38 -0300
committerShauren <shauren.trinity@gmail.com>2022-03-20 16:03:44 +0100
commit7de20bcc1cab0c069b67840be5d648fda297d641 (patch)
tree5e511bea8b199f2d040420b819e826dee2f20a42 /src
parenteba9e91964f2b3d58cdbf34e0877d4f686e0860b (diff)
Entities/Unit: Fixed wrong combat stop when remove charm (#27038)
(cherry picked from commit fa3a62ae4e890dc526f2f0474e3469ccddb15edf)
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 7e91f3a235f..d995a57617f 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -11219,7 +11219,7 @@ void Unit::RemoveCharmedBy(Unit* charmer)
type = CHARM_TYPE_CHARM;
CastStop();
- CombatStop(); /// @todo CombatStop(true) may cause crash (interrupt spells)
+ AttackStop();
if (_oldFactionId)
{