aboutsummaryrefslogtreecommitdiff
path: root/src/game/Unit.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-02-23 16:36:11 +0100
committerQAston <none@none>2009-02-23 16:36:11 +0100
commitf963629e552fc56cae1afbbaee5df1161b53af5d (patch)
tree746be8bd066a091b72bc5b891da0e7958f436438 /src/game/Unit.cpp
parent255736028fe93e1c5b5c39cab003bff6ab84c926 (diff)
*Save aurastates for all auras from spell, not only for first one.
*Bring back old code for frozen aura state(by megamage). *Remove visible aura slot on aura destruction instead on sending aura update. --HG-- branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r--src/game/Unit.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 43a8712fcfc..0e52f4aa983 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -7688,13 +7688,13 @@ Unit* Unit::GetNextRandomRaidMemberOrPet(float radius)
Player* Target = itr->getSource();
// IsHostileTo check duel and controlled by enemy
- if( Target && Target !=this && IsWithinDistInMap(Target, radius) &&
+ if( Target && Target !=this && Target->isAlive() && IsWithinDistInMap(Target, radius) &&
!IsHostileTo(Target) )
nearMembers.push_back(Target);
// Push player's pet to vector
Unit * pet = Target->GetPet();
- if (pet && pet !=this && IsWithinDistInMap(pet, radius) &&
+ if (pet && pet !=this && pet->isAlive() && IsWithinDistInMap(pet, radius) &&
!IsHostileTo(pet) )
nearMembers.push_back(pet);
}
@@ -12808,7 +12808,6 @@ void Unit::SendAuraUpdate(uint8 slot)
if(!ptr)
{
- RemoveVisibleAura(slot);
SendMessageToSet(&data, true);
return;
}