From a7f66eb006d77adc938381fa3edfdeada48cd02b Mon Sep 17 00:00:00 2001
From: Shard <30301841+Shard-MW@users.noreply.github.com>
Date: Sun, 15 Mar 2026 00:32:54 +0100
Subject: [PATCH] fix(Core/Unit): Fix infinite loop in RemoveAllControlled
 (#25087)

---
 src/server/game/Entities/Unit/Unit.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 9bd465b4e..721361e57 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -8102,6 +8102,8 @@ void Unit::RemoveAllControlled(bool onDeath /*= false*/)
                 target->ToTempSummon()->UnSummon();
                 it = m_Controlled.erase(it);
             }
+            else
+                ++it;
         }
         else
         {