diff options
| author | QAston <none@none> | 2010-01-16 15:12:21 +0100 |
|---|---|---|
| committer | QAston <none@none> | 2010-01-16 15:12:21 +0100 |
| commit | 69b29001370a46028fb6d5badfacaaaadbe1438c (patch) | |
| tree | fd2ce307944c72fe4c2c24d5cbef84e206d223a1 /src/game/DynamicObject.cpp | |
| parent | 72277c583b76a8fcec30588c6d3f56f3619af738 (diff) | |
*Fix single target auras related crash
*Apply aura stacking rules to m_ownedAuras holder.
--HG--
branch : trunk
Diffstat (limited to 'src/game/DynamicObject.cpp')
| -rw-r--r-- | src/game/DynamicObject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp index ee3c42680ec..1b379afccc8 100644 --- a/src/game/DynamicObject.cpp +++ b/src/game/DynamicObject.cpp @@ -120,7 +120,8 @@ void DynamicObject::Update(uint32 p_time) if (!m_aura->IsRemoved()) m_aura->UpdateOwner(p_time, this); - if (m_aura->IsRemoved() || m_aura->IsExpired()) + // m_aura may be set to null in Unit::RemoveGameObject call + if (m_aura && (m_aura->IsRemoved() || m_aura->IsExpired())) expired = true; } else |