diff options
Diffstat (limited to 'src/game/GameObject.cpp')
| -rw-r--r-- | src/game/GameObject.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index d2d8044a322..b690dbccddb 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -77,9 +77,10 @@ void GameObject::CleanupsBeforeDelete() if(uint64 owner_guid = GetOwnerGUID()) { Unit* owner = NULL; - if(IS_PLAYER_GUID(owner_guid)) + // Object may be deleted while player is not in world, skip this check for now. + /*if(IS_PLAYER_GUID(owner_guid)) owner = ObjectAccessor::GetObjectInWorld(owner_guid, (Player*)NULL); - else + else*/ owner = ObjectAccessor::GetUnit(*this,owner_guid); if(owner) |