diff options
| author | xinef1 <w.szyszko2@gmail.com> | 2016-12-26 13:42:31 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-12-26 13:42:31 +0100 |
| commit | 7c3961244d83503191881cfd64745781cc1253ab (patch) | |
| tree | 586420440c94152f3616ab3545f2501250333b88 /src | |
| parent | 2aae46ad49851239f69910dc0ccd2efed87bdb10 (diff) | |
Core/Units: Fixed bug in stun code making units summoned by npcs to never break out of stun (#18612)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index c3e4d086024..16d29f0bc61 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11970,8 +11970,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 |