mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 16:37:01 +00:00
[10371] More wide use ObjectGuid in group code.
Also drop some unused functions. And fix some uint32 -> uint6 guid assigns.
This commit is contained in:
parent
acdaac3587
commit
dbe9c6f190
19 changed files with 354 additions and 346 deletions
|
|
@ -2017,13 +2017,13 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
|
|||
if( targetOwner->GetTypeId() == TYPEID_PLAYER &&
|
||||
target->GetTypeId() == TYPEID_UNIT && (((Creature*)target)->isPet()) &&
|
||||
target->GetOwnerGUID() == targetOwner->GetGUID() &&
|
||||
pGroup->IsMember(((Player*)targetOwner)->GetGUID()))
|
||||
pGroup->IsMember(((Player*)targetOwner)->GetObjectGuid()))
|
||||
{
|
||||
targetUnitMap.push_back(target);
|
||||
}
|
||||
}
|
||||
// 1Our target can be a player who is on our group
|
||||
else if (target->GetTypeId() == TYPEID_PLAYER && pGroup->IsMember(((Player*)target)->GetGUID()))
|
||||
else if (target->GetTypeId() == TYPEID_PLAYER && pGroup->IsMember(((Player*)target)->GetObjectGuid()))
|
||||
{
|
||||
targetUnitMap.push_back(target);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue