diff options
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 |