Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 00:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2008-12-24 12:23:48 -06:00
parent f511dc2c12 4a917033c5
commit 8c6b82f448
5 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/game/Unit.cpp
View File

@@ -13064,8 +13064,25 @@ bool Unit::IsInRaidWith(Unit const *unit) const
return false;
}
void Unit::GetRaidMember(std::list<Unit*> &TagUnitMap, float radius)
void Unit::GetRaidMember(std::list<Unit*> &nearMembers, float radius)
{
Player *owner = GetCharmerOrOwnerPlayerOrPlayerItself();
if(!owner)
return;
Group *pGroup = owner->GetGroup();
if(!pGroup)
return;
for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
{
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);
}
}
void Unit::GetPartyMember(std::list<Unit*> &TagUnitMap, float radius)
@@ -13107,17 +13124,23 @@ void Unit::GetPartyMember(std::list<Unit*> &TagUnitMap, float radius)
void Unit::AddAura(uint32 spellId, Unit* target)
{
if(!target)
if(!target || !target->isAlive())
return;
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
if(!spellInfo)
return;
if (target->IsImmunedToSpell(spellInfo))
return;
for(uint32 i = 0; i < 3; ++i)
{
if(spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA)
{
if(target->IsImmunedToSpellEffect(spellInfo->Effect[i], spellInfo->EffectMechanic[i]))
continue;
if(spellInfo->EffectImplicitTargetA[i] == TARGET_UNIT_CASTER)
{
Aura *Aur = CreateAura(spellInfo, i, NULL, this, this);