[8102] Simplify code base at new root method WorldObject::CleanupsBeforeDelete Author: VladimirMangos

    * Call it from Map::AddObjectToRemoveList and remove now not needed explcit calls
    * Create Gameobject version to make GO with owner more safe for remove

--HG--
branch : trunk

1 files changed, 2 insertions, 1 deletions

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 6dbb0e37c86..044d48cac36 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -1010,7 +1010,6 @@ void Map::MoveAllCreaturesInMoveList()
                 if((sLog.getLogFilter() & LOG_FILTER_CREATURE_MOVES)==0)
                     sLog.outDebug("Creature (GUID: %u Entry: %u ) can't be move to unloaded respawn grid.",c->GetGUIDLow(),c->GetEntry());
                 #endif
-                c->CleanupsBeforeDelete();
                 AddObjectToRemoveList(c);
             }
         }
@@ -2151,6 +2150,8 @@ void Map::AddObjectToRemoveList(WorldObject *obj)
 {
     assert(obj->GetMapId()==GetId() && obj->GetInstanceId()==GetInstanceId());
 
+    obj->CleanupsBeforeDelete();                            // remove or simplify at least cross referenced links
+
     i_objectsToRemove.insert(obj);
     //sLog.outDebug("Object (GUID: %u TypeId: %u ) added to removing list.",obj->GetGUIDLow(),obj->GetTypeId());
 }