From 95cca081de3cc251827e28f0e56fddbbeee94f50 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 6 May 2020 13:51:15 -0400 Subject: [PATCH] Core/Creatures: Fixed GMs being considered in party/raid with nearby creatures without CREATURE_TYPE_FLAG_TREAT_AS_RAID_UNIT Port From (https://github.com/TrinityCore/TrinityCore/commit/b8b6fd9ca0defda540f122bedf5f187d45bc11c7) --- Source/Game/Entities/Unit/Unit.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Game/Entities/Unit/Unit.cs b/Source/Game/Entities/Unit/Unit.cs index 1f26c9a30..3b7282d2d 100644 --- a/Source/Game/Entities/Unit/Unit.cs +++ b/Source/Game/Entities/Unit/Unit.cs @@ -2575,8 +2575,7 @@ namespace Game.Entities (u1.IsTypeId(TypeId.Player) && u2.IsTypeId(TypeId.Unit) && u2.ToCreature().GetCreatureTemplate().TypeFlags.HasAnyFlag(CreatureTypeFlags.TreatAsRaidUnit))) return true; - // else u1.GetTypeId() == u2.GetTypeId() == TYPEID_UNIT - return u1.GetFaction() == u2.GetFaction(); + return u1.GetTypeId() == TypeId.Unit && u2.GetTypeId() == TypeId.Unit && u1.GetFaction() == u2.GetFaction(); } public bool IsInRaidWith(Unit unit)