diff options
| author | MitchesD <majklprofik@seznam.cz> | 2015-04-19 14:44:59 +0200 |
|---|---|---|
| committer | MitchesD <majklprofik@seznam.cz> | 2015-04-19 14:49:29 +0200 |
| commit | 7836a4a41808c54e32f508718a431d4c710c1ce8 (patch) | |
| tree | f83d8c95dfa3ab88f76050c2f7b9677b179a1385 | |
| parent | aeaf4da0eb26dfdb20fc0c30e29bdef14dca6e4e (diff) | |
Core/Unit: fixed removing UNIT_FLAG_PET_IN_COMBAT from guardians
Closes https://github.com/TrinityCore/TrinityCore/issues/14566
(cherry picked from commit 8096edec15dc2c51d2c9f57b618cd0ced569f793)
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index d29c970c5de..e3740f63848 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11807,7 +11807,7 @@ void Unit::ClearInCombat() if (HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TAPPED)) SetUInt32Value(UNIT_DYNAMIC_FLAGS, creature->GetCreatureTemplate()->dynamicflags); - if (creature->IsPet()) + if (creature->IsPet() || creature->IsGuardian()) { if (Unit* owner = GetOwner()) for (uint8 i = 0; i < MAX_MOVE_TYPE; ++i) |