*Fix a crash when go is removed but m_ObjectSlot is not cleared.

--HG--
branch : trunk

1 files changed, 9 insertions, 0 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 645c1556861..68d7b1fe02a 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -4664,6 +4664,15 @@ void Unit::RemoveGameObject(GameObject* gameObj, bool del)
 
     gameObj->SetOwnerGUID(0);
 
+    for(uint32 i = 0; i < 4; ++i)
+    {
+        if(m_ObjectSlot[i] == gameObj->GetGUID())
+        {
+            m_ObjectSlot[i] = 0;
+            break;
+        }
+    }
+
     // GO created by some spell
     if (uint32 spellid = gameObj->GetSpellId())
     {