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)
2020-05-06 13:51:15 -04:00
parent 2ed40d012a
commit 95cca081de
1 changed files with 1 additions and 2 deletions
@@ -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)