From 7836a4a41808c54e32f508718a431d4c710c1ce8 Mon Sep 17 00:00:00 2001 From: MitchesD Date: Sun, 19 Apr 2015 14:44:59 +0200 Subject: Core/Unit: fixed removing UNIT_FLAG_PET_IN_COMBAT from guardians Closes https://github.com/TrinityCore/TrinityCore/issues/14566 (cherry picked from commit 8096edec15dc2c51d2c9f57b618cd0ced569f793) --- src/server/game/Entities/Unit/Unit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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) -- cgit v1.2.3