From afd3f0383595f32d866029e6b57f40fda6d2e119 Mon Sep 17 00:00:00 2001 From: QAston Date: Sat, 21 Mar 2009 17:25:04 +0100 Subject: [PATCH] *Fix area auras cast in party. *Fix damage amount of stacked auras. --HG-- branch : trunk --- src/game/SpellAuras.cpp | 2 ++ src/game/Unit.cpp | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 9fdedb6f43..9e56b7e2bd 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -1085,6 +1085,8 @@ void Aura::SetStackAmount(uint8 stackAmount) void Aura::InitStackAmount(uint8 stackAmount) { m_stackAmount = stackAmount; + Modifier* mod = GetModifier(); + mod->m_amount*=m_stackAmount; } bool Aura::modStackAmount(int32 num) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 09557e9310..9bf6b86e51 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -13251,10 +13251,15 @@ void Unit::GetRaidMember(std::list &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