From 8096edec15dc2c51d2c9f57b618cd0ced569f793 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 --- src/server/game/Entities/Unit/Unit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server') 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) -- cgit v1.2.3