From 4d3d2290eb8d47f3cf232abd17656928e0382048 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sun, 18 Mar 2018 11:56:37 -0400 Subject: [PATCH] Core/Units: Fixed bug in stun code making units summoned by npcs to never break out of stun --- Source/Game/Entities/Unit/Unit.Movement.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Game/Entities/Unit/Unit.Movement.cs b/Source/Game/Entities/Unit/Unit.Movement.cs index 3d61909de..80129dc83 100644 --- a/Source/Game/Entities/Unit/Unit.Movement.cs +++ b/Source/Game/Entities/Unit/Unit.Movement.cs @@ -1149,8 +1149,8 @@ namespace Game.Entities SetTarget(GetVictim().GetGUID()); // don't remove UNIT_FLAG_STUNNED for pet when owner is mounted (disabled pet's interface) - Unit owner = GetOwner(); - if (owner == null || (owner.IsTypeId(TypeId.Player) && !owner.ToPlayer().IsMounted())) + Unit owner = GetCharmerOrOwner(); + if (owner == null || !owner.IsTypeId(TypeId.Player) || !owner.ToPlayer().IsMounted()) RemoveFlag(UnitFields.Flags, UnitFlags.Stunned); if (!HasUnitState(UnitState.Root)) // prevent moving if it also has root effect