Merge pull request #4771 from devilcoredev/fix_001

Core/Spells: Fix the 'Trueshot Aura' on pet
This commit is contained in:
QAston
2012-01-12 08:33:32 -08:00
+2 -2
View File
@@ -16261,7 +16261,7 @@ void Unit::GetRaidMember(std::list<Unit*> &nearMembers, float radius)
if (owner->isAlive() && (owner == this || IsWithinDistInMap(owner, radius))) if (owner->isAlive() && (owner == this || IsWithinDistInMap(owner, radius)))
nearMembers.push_back(owner); nearMembers.push_back(owner);
if (Guardian* pet = owner->GetGuardianPet()) if (Guardian* pet = owner->GetGuardianPet())
if (pet->isAlive() && (pet == this && IsWithinDistInMap(pet, radius))) if (pet->isAlive() && (pet == this || IsWithinDistInMap(pet, radius)))
nearMembers.push_back(pet); nearMembers.push_back(pet);
} }
} }
@@ -16298,7 +16298,7 @@ void Unit::GetPartyMemberInDist(std::list<Unit*> &TagUnitMap, float radius)
if (owner->isAlive() && (owner == this || IsWithinDistInMap(owner, radius))) if (owner->isAlive() && (owner == this || IsWithinDistInMap(owner, radius)))
TagUnitMap.push_back(owner); TagUnitMap.push_back(owner);
if (Guardian* pet = owner->GetGuardianPet()) if (Guardian* pet = owner->GetGuardianPet())
if (pet->isAlive() && (pet == this && IsWithinDistInMap(pet, radius))) if (pet->isAlive() && (pet == this || IsWithinDistInMap(pet, radius)))
TagUnitMap.push_back(pet); TagUnitMap.push_back(pet);
} }
} }