From 5258dc74d187b6128812e117672949789c3bbf08 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sat, 27 Apr 2019 20:10:03 +0200 Subject: [PATCH] Core/Spells: do not allow root auras to bypass the root movement data for creatures when getting removed --- src/server/game/Entities/Unit/Unit.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 204a60e168..ba9ff7f56c 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11970,6 +11970,10 @@ void Unit::SetControlled(bool apply, UnitState state) if (HasAuraType(SPELL_AURA_MOD_ROOT) || GetVehicle()) return; + if (Creature* creature = ToCreature()) + if (creature->GetMovementTemplate().IsRooted) + return; + ClearUnitState(state); SetRooted(false); break;