diff options
| author | QAston <qaston@gmail.com> | 2012-01-12 08:33:32 -0800 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2012-01-12 08:33:32 -0800 |
| commit | 95ad9a992de30bdfe7528f5966765fb49f213ace (patch) | |
| tree | fc83a5fa4c5668fde15a383c687fac9bd988b761 /src | |
| parent | 233d8919528879a26b1aa03373fee590f2307c9d (diff) | |
| parent | 885e9fda34c39a4e3246080431789b012836ddf8 (diff) | |
Merge pull request #4771 from devilcoredev/fix_001
Core/Spells: Fix the 'Trueshot Aura' on pet
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 753d1fb752c..2d6e8f1b724 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -16261,7 +16261,7 @@ void Unit::GetRaidMember(std::list<Unit*> &nearMembers, float radius) if (owner->isAlive() && (owner == this || IsWithinDistInMap(owner, radius))) nearMembers.push_back(owner); 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); } } @@ -16298,7 +16298,7 @@ void Unit::GetPartyMemberInDist(std::list<Unit*> &TagUnitMap, float radius) if (owner->isAlive() && (owner == this || IsWithinDistInMap(owner, radius))) TagUnitMap.push_back(owner); 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); } } |