diff options
| author | S.V <svranesevic@users.noreply.github.com> | 2017-03-21 17:27:14 +0100 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2020-04-24 17:18:49 +0200 |
| commit | b8b6fd9ca0defda540f122bedf5f187d45bc11c7 (patch) | |
| tree | 6244f4eff742d4b446322b251c1442fe7ed759bc | |
| parent | b2346586179b3b9ceea731da3c3f7e475a3dbcfe (diff) | |
Core/Creatures: Fixed GMs being considered in party/raid with nearby creatures without CREATURE_TYPE_FLAG_TREAT_AS_RAID_UNIT
Ref #19340
(cherry picked from commit eea16ce35630762703b8f71d31c827179c37bfc4)
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 0ed7828e6fd..27ed7760160 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12179,8 +12179,8 @@ bool Unit::IsInPartyWith(Unit const* unit) const if (this == unit) return true; - const Unit* u1 = GetCharmerOrOwnerOrSelf(); - const Unit* u2 = unit->GetCharmerOrOwnerOrSelf(); + Unit const* u1 = GetCharmerOrOwnerOrSelf(); + Unit const* u2 = unit->GetCharmerOrOwnerOrSelf(); if (u1 == u2) return true; @@ -12190,8 +12190,7 @@ bool Unit::IsInPartyWith(Unit const* unit) const (u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_UNIT && u2->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_TREAT_AS_RAID_UNIT)) 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(); } bool Unit::IsInRaidWith(Unit const* unit) const @@ -12199,8 +12198,8 @@ bool Unit::IsInRaidWith(Unit const* unit) const if (this == unit) return true; - const Unit* u1 = GetCharmerOrOwnerOrSelf(); - const Unit* u2 = unit->GetCharmerOrOwnerOrSelf(); + Unit const* u1 = GetCharmerOrOwnerOrSelf(); + Unit const* u2 = unit->GetCharmerOrOwnerOrSelf(); if (u1 == u2) return true; @@ -12210,8 +12209,7 @@ bool Unit::IsInRaidWith(Unit const* unit) const (u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_UNIT && u2->ToCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_TREAT_AS_RAID_UNIT)) 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(); } void Unit::GetPartyMembers(std::list<Unit*> &TagUnitMap) |