From 7de20bcc1cab0c069b67840be5d648fda297d641 Mon Sep 17 00:00:00 2001 From: Lucas Nascimento Date: Sun, 17 Oct 2021 17:02:38 -0300 Subject: Entities/Unit: Fixed wrong combat stop when remove charm (#27038) (cherry picked from commit fa3a62ae4e890dc526f2f0474e3469ccddb15edf) --- 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 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) { -- cgit v1.2.3