aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMitchesD <majklprofik@seznam.cz>2015-04-19 14:44:59 +0200
committerMitchesD <majklprofik@seznam.cz>2015-04-19 14:44:59 +0200
commit8096edec15dc2c51d2c9f57b618cd0ced569f793 (patch)
tree08161218368ebafd59330f3595cec64dd9b2868f /src
parentb2e6e678c3fdb9b17e207c7d4ae07f887547e510 (diff)
Core/Unit: fixed removing UNIT_FLAG_PET_IN_COMBAT from guardians
Closes https://github.com/TrinityCore/TrinityCore/issues/14566
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp2
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 06ad25d9e42..61ce8cc5d83 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -9902,7 +9902,7 @@ void Unit::ClearInCombat()
if (HasFlag(OBJECT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TAPPED))
SetUInt32Value(OBJECT_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)