aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQAston <none@none>2009-02-23 22:34:14 +0100
committerQAston <none@none>2009-02-23 22:34:14 +0100
commitbefa36f8b91ab2a08719ff4d1df0433d9ac604b1 (patch)
treece23de3c8fd177e9c802a76f74f2a353cc95c5ca /src
parent4cda43dce522f5b784e1cd0e49e672496ee80907 (diff)
*Particulary revert 1537.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/SpellAuras.cpp12
-rw-r--r--src/game/Unit.cpp1
2 files changed, 1 insertions, 12 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 289a1f48ea0..fe16e488b3d 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -464,18 +464,6 @@ Aura::~Aura()
{
AuraSlotEntry * entry = m_target->GetVisibleAura(GetAuraSlot());
entry->m_slotAuras[GetEffIndex()]=NULL;
- //Check if there any aura in slot still exists
- bool remove=true;
- for (uint8 i=0 ; i<3; i++)
- {
- if (entry->m_slotAuras[i])
- {
- remove=false;
- break;
- }
- }
- if (remove)
- m_target->RemoveVisibleAura(GetAuraSlot());
}
}
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 0e52f4aa983..8bc70d365cd 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -12808,6 +12808,7 @@ void Unit::SendAuraUpdate(uint8 slot)
if(!ptr)
{
+ RemoveVisibleAura(slot);
SendMessageToSet(&data, true);
return;
}