From 40ed37c1e73bcd1e4d7e48310591e082b82690e0 Mon Sep 17 00:00:00 2001
From: Machiavelli <machiavelli.trinity@gmail.com>
Date: Sat, 8 Oct 2011 15:06:31 +0200
Subject: Core/GameObects: Fix a crash in GameObject::Delete

---
 src/server/game/Entities/GameObject/GameObject.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index ac4e5f76e69..03da98d5624 100755
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -610,6 +610,8 @@ void GameObject::Delete()
     if (GetOwnerGUID())
         if (Unit* owner = GetOwner())
             owner->RemoveGameObject(this, false);
+        else    //! Owner not in world anymore
+            SetOwnerGUID(0);
 
     ASSERT (!GetOwnerGUID());
     SendObjectDeSpawnAnim(GetGUID());
-- 
cgit v1.2.3