From d01a22f58ea19ce9ec71ea7c26adfbdea183fbd2 Mon Sep 17 00:00:00 2001 From: Ovah Date: Thu, 1 Aug 2019 15:40:07 +0200 Subject: Core/Spells: fixed root behaivior of creatures that are being rooted via movement template while getting a root aura removed (#23216) * Core/Spells: do not allow root auras to bypass the root movement template state when getting removed * yeah.... (cherry picked from commit d629bad7a19c1f4c4cd9fb4382fadd97b320dc38) --- 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 996f06bbf5f..0709c67ae2d 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10652,7 +10652,7 @@ void Unit::SetControlled(bool apply, UnitState state) SetStunned(false); break; case UNIT_STATE_ROOT: - if (HasAuraType(SPELL_AURA_MOD_ROOT) || HasAuraType(SPELL_AURA_MOD_ROOT_2) || GetVehicle()) + if (HasAuraType(SPELL_AURA_MOD_ROOT) || HasAuraType(SPELL_AURA_MOD_ROOT_2) || GetVehicle() || (ToCreature() && ToCreature()->GetMovementTemplate().IsRooted())) return; ClearUnitState(state); -- cgit v1.2.3