diff options
| author | QAston <none@none> | 2009-05-01 17:21:16 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-05-01 17:21:16 +0200 |
| commit | a098dc72fcb86880955a1e5ba775c5aaefe78e1e (patch) | |
| tree | eb01e91364ae062c39e03d4da3fdeeb2fab9ea7f /src/game/Unit.cpp | |
| parent | 0f5a9cb46f495d8a0cbf9923a4ef31734979cbc7 (diff) | |
*Do not apply auras with 4th diminishing level
*Some fixes related to last commit.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index b1a39c30cce..a859957d53e 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -3259,7 +3259,7 @@ void Unit::_UpdateSpells( uint32 time ) for(AuraMap::iterator i = m_Auras.begin(); i != m_Auras.end();) { - if(!i->second->GetAuraDuration() && !(i->second->IsPermanent() || (i->second->IsPassive()))) + if(i->second->IsExpired()) RemoveAura(i, AURA_REMOVE_BY_EXPIRE); else ++i; @@ -3673,7 +3673,7 @@ int32 Unit::GetMaxNegativeAuraModifierByMiscValue(AuraType auratype, int32 misc_ bool Unit::AddAura(Aura *Aur) { // aura doesn't apply effects-return - if (!Aur->GetEffectMask()) + if (!Aur->GetEffectMask() || Aur->IsExpired()) { delete Aur; return false; |