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)
This commit is contained in:
@@ -2575,8 +2575,7 @@ namespace Game.Entities
|
|||||||
(u1.IsTypeId(TypeId.Player) && u2.IsTypeId(TypeId.Unit) && u2.ToCreature().GetCreatureTemplate().TypeFlags.HasAnyFlag(CreatureTypeFlags.TreatAsRaidUnit)))
|
(u1.IsTypeId(TypeId.Player) && u2.IsTypeId(TypeId.Unit) && u2.ToCreature().GetCreatureTemplate().TypeFlags.HasAnyFlag(CreatureTypeFlags.TreatAsRaidUnit)))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// else u1.GetTypeId() == u2.GetTypeId() == TYPEID_UNIT
|
return u1.GetTypeId() == TypeId.Unit && u2.GetTypeId() == TypeId.Unit && u1.GetFaction() == u2.GetFaction();
|
||||||
return u1.GetFaction() == u2.GetFaction();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool IsInRaidWith(Unit unit)
|
public bool IsInRaidWith(Unit unit)
|
||||||
|
|||||||
Reference in New Issue
Block a user