From 69b29001370a46028fb6d5badfacaaaadbe1438c Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Sat, 16 Jan 2010 15:12:21 +0100
Subject: *Fix single target auras related crash *Apply aura stacking rules to
 m_ownedAuras holder.

--HG--
branch : trunk
---
 src/game/DynamicObject.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/game/DynamicObject.cpp')

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
-- 
cgit v1.2.3