1 files changed, 14 insertions, 60 deletions

diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h
index e87860fa0ee..411cae10a90 100755
--- a/src/server/game/Grids/ObjectGridLoader.h
+++ b/src/server/game/Grids/ObjectGridLoader.h
@@ -36,7 +36,6 @@ class ObjectGridLoader
             : i_cell(cell), i_grid(grid), i_map(map), i_gameObjects(0), i_creatures(0), i_corpses (0)
             {}
 
-        void Load(GridType &grid);
         void Visit(GameObjectMapType &m);
         void Visit(CreatureMapType &m);
         void Visit(CorpseMapType &) const {}
@@ -55,79 +54,34 @@ class ObjectGridLoader
         uint32 i_corpses;
 };
 
-class ObjectGridUnloader
+//Stop the creatures before unloading the NGrid
+class ObjectGridStoper
 {
     public:
-        ObjectGridUnloader(NGridType &grid) : i_grid(grid) {}
-
-        void MoveToRespawnN();
-        void UnloadN()
-        {
-            for (unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x)
-            {
-                for (unsigned int y=0; y < MAX_NUMBER_OF_CELLS; ++y)
-                {
-                    GridLoader<Player, AllWorldObjectTypes, AllGridObjectTypes> loader;
-                    loader.Unload(i_grid(x, y), *this);
-                }
-            }
-        }
-
-        void Unload(GridType &grid);
-        template<class T> void Visit(GridRefManager<T> &m);
-    private:
-        NGridType &i_grid;
+        void Visit(CreatureMapType &m);
+        template<class T> void Visit(GridRefManager<T> &) {}
 };
 
-class ObjectGridStoper
+//Move the foreign creatures back to respawn positions before unloading the NGrid
+class ObjectGridEvacuator
 {
     public:
-        ObjectGridStoper(NGridType &grid) : i_grid(grid) {}
-
-        void StopN()
-        {
-            for (unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x)
-            {
-                for (unsigned int y=0; y < MAX_NUMBER_OF_CELLS; ++y)
-                {
-                    GridLoader<Player, AllWorldObjectTypes, AllGridObjectTypes> loader;
-                    loader.Stop(i_grid(x, y), *this);
-                }
-            }
-        }
-
-        void Stop(GridType &grid);
         void Visit(CreatureMapType &m);
-
-        template<class NONACTIVE> void Visit(GridRefManager<NONACTIVE> &) {}
-    private:
-        NGridType &i_grid;
+        template<class T> void Visit(GridRefManager<T> &) {}
 };
 
+//Clean up and remove from world
 class ObjectGridCleaner
 {
     public:
-        ObjectGridCleaner(NGridType &grid) : i_grid(grid) {}
-
-        void CleanN()
-        {
-            for (unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x)
-            {
-                for (unsigned int y=0; y < MAX_NUMBER_OF_CELLS; ++y)
-                {
-                    GridLoader<Player, AllWorldObjectTypes, AllGridObjectTypes> loader;
-                    loader.Stop(i_grid(x, y), *this);
-                }
-            }
-        }
-
-        void Stop(GridType &grid);
         void Visit(CreatureMapType &m);
         template<class T> void Visit(GridRefManager<T> &);
-    private:
-        NGridType &i_grid;
 };
 
-typedef GridLoader<Player, AllWorldObjectTypes, AllGridObjectTypes> GridLoaderType;
+//Delete objects before deleting NGrid
+class ObjectGridUnloader
+{
+    public:
+        template<class T> void Visit(GridRefManager<T> &m);
+};
 #endif
-