aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMachiavelli <machiavelli.trinity@gmail.com>2011-10-08 15:06:31 +0200
committerMachiavelli <machiavelli.trinity@gmail.com>2011-10-08 15:06:31 +0200
commit40ed37c1e73bcd1e4d7e48310591e082b82690e0 (patch)
tree4397affbc69ad2f40e27e07405904c241dc1e648 /src
parentf266d3d957e642455b350b5f9b7945dff1a030d5 (diff)
Core/GameObects: Fix a crash in GameObject::Delete
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Entities/GameObject/GameObject.cpp2
1 files changed, 2 insertions, 0 deletions
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());