aboutsummaryrefslogtreecommitdiff
path: root/src/game/Unit.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-03-21 17:25:04 +0100
committerQAston <none@none>2009-03-21 17:25:04 +0100
commitafd3f0383595f32d866029e6b57f40fda6d2e119 (patch)
tree9da0d77fe6c17c7e33bc9ec3f2aee22aac9c1d38 /src/game/Unit.cpp
parenta54957ba4193f439df86d7d02bb41b918cea529b (diff)
*Fix area auras cast in party.
*Fix damage amount of stacked auras. --HG-- branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r--src/game/Unit.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 09557e93108..9bf6b86e513 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -13251,10 +13251,15 @@ void Unit::GetRaidMember(std::list<Unit*> &nearMembers, float radius)
{
Player* Target = itr->getSource();
- // IsHostileTo check duel and controlled by enemy
- if( Target && Target != this && Target->isAlive()
- && IsWithinDistInMap(Target, radius) && !IsHostileTo(Target) )
- nearMembers.push_back(Target);
+ if( Target && !IsHostileTo(Target) )
+ {
+ if(Target->isAlive() && IsWithinDistInMap(Target, radius) )
+ nearMembers.push_back(Target);
+
+ if(Pet* pet = Target->GetPet())
+ if(pet->isAlive() && IsWithinDistInMap(pet, radius) )
+ nearMembers.push_back(pet);
+ }
}
}
else