From dce82d7105c06a6eed5f23bc304d18ba3bb0fe81 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Sat, 11 Apr 2026 15:45:46 -0300 Subject: [PATCH] fix(Core/Unit): Clear invalid combat refs after mind control (#25424) Co-authored-by: Lucas Nascimento --- src/server/game/Entities/Unit/Unit.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 644906240..d0ae866b6 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -14878,6 +14878,9 @@ void Unit::RemoveCharmedBy(Unit* charmer) StopAttackingInvalidTarget(); + // End stale combat refs between now-friendly units after faction restore + GetCombatManager().RevalidateCombat(); + Player* playerCharmer = charmer->ToPlayer(); if (playerCharmer) {