From 10af748969bc43d7bdcfaf70daadef31c84ef0dd Mon Sep 17 00:00:00 2001 From: xinef1 Date: Mon, 26 Dec 2016 13:42:31 +0100 Subject: Core/Units: Fixed bug in stun code making units summoned by npcs to never break out of stun (#18612) (cherry picked from commit 7c3961244d83503191881cfd64745781cc1253ab) --- src/server/game/Entities/Unit/Unit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 1d6ba29800b..719f58ad870 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11219,8 +11219,8 @@ void Unit::SetStunned(bool apply) SetTarget(EnsureVictim()->GetGUID()); // don't remove UNIT_FLAG_STUNNED for pet when owner is mounted (disabled pet's interface) - Unit* owner = GetOwner(); - if (!owner || (owner->GetTypeId() == TYPEID_PLAYER && !owner->ToPlayer()->IsMounted())) + Unit* owner = GetCharmerOrOwner(); + if (!owner || owner->GetTypeId() != TYPEID_PLAYER || !owner->ToPlayer()->IsMounted()) RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); if (!HasUnitState(UNIT_STATE_ROOT)) // prevent moving if it also has root effect -- cgit v1.2.3