From 31a88d4fe5d5dea87f4dad24e4d7c3c1d47fc48c Mon Sep 17 00:00:00 2001
From: megamage <none@none.none>
Date: Thu, 10 Nov 2011 17:31:45 -0500
Subject: Fix the crash when removing object from an unloaded grid. Object
 should always be unlinked from grid no matter if the grid is loaded.

---
 src/server/shared/Dynamic/TypeContainerFunctions.h | 51 +++++++++++-----------
 1 file changed, 25 insertions(+), 26 deletions(-)

(limited to 'src/server/shared/Dynamic')

diff --git a/src/server/shared/Dynamic/TypeContainerFunctions.h b/src/server/shared/Dynamic/TypeContainerFunctions.h
index 981cd82197f..9bfbf47da93 100755
--- a/src/server/shared/Dynamic/TypeContainerFunctions.h
+++ b/src/server/shared/Dynamic/TypeContainerFunctions.h
@@ -62,7 +62,7 @@ namespace Trinity
     template<class SPECIFIC_TYPE> SPECIFIC_TYPE* Insert(ContainerMapList<SPECIFIC_TYPE> &elements, SPECIFIC_TYPE *obj)
     {
         //elements._element[hdl] = obj;
-        obj->GetGridRef().link(&elements._element, obj);
+        obj->AddToGrid(elements._element);
         return obj;
     };
 
@@ -84,31 +84,30 @@ namespace Trinity
         return (t != NULL ? t : Insert(elements._TailElements, obj));
     }
 
-    // non-const remove method
-    template<class SPECIFIC_TYPE> SPECIFIC_TYPE* Remove(ContainerMapList<SPECIFIC_TYPE> & /*elements*/, SPECIFIC_TYPE *obj)
-    {
-        obj->GetGridRef().unlink();
-        return obj;
-    }
-
-    template<class SPECIFIC_TYPE> SPECIFIC_TYPE* Remove(ContainerMapList<TypeNull> &/*elements*/, SPECIFIC_TYPE * /*obj*/)
-    {
-        return NULL;
-    }
-
-    // this is a missed
-    template<class SPECIFIC_TYPE, class T> SPECIFIC_TYPE* Remove(ContainerMapList<T> &/*elements*/, SPECIFIC_TYPE * /*obj*/)
-    {
-        return NULL;                                        // a missed
-    }
-
-    template<class SPECIFIC_TYPE, class T, class H> SPECIFIC_TYPE* Remove(ContainerMapList<TypeList<H, T> > &elements, SPECIFIC_TYPE *obj)
-    {
-        // The head element is bad
-        SPECIFIC_TYPE* t = Remove(elements._elements, obj);
-        return ( t != NULL ? t : Remove(elements._TailElements, obj) );
-    }
-
+    //// non-const remove method
+    //template<class SPECIFIC_TYPE> SPECIFIC_TYPE* Remove(ContainerMapList<SPECIFIC_TYPE> & /*elements*/, SPECIFIC_TYPE *obj)
+    //{
+    //    obj->GetGridRef().unlink();
+    //    return obj;
+    //}
+
+    //template<class SPECIFIC_TYPE> SPECIFIC_TYPE* Remove(ContainerMapList<TypeNull> &/*elements*/, SPECIFIC_TYPE * /*obj*/)
+    //{
+    //    return NULL;
+    //}
+
+    //// this is a missed
+    //template<class SPECIFIC_TYPE, class T> SPECIFIC_TYPE* Remove(ContainerMapList<T> &/*elements*/, SPECIFIC_TYPE * /*obj*/)
+    //{
+    //    return NULL;                                        // a missed
+    //}
+
+    //template<class SPECIFIC_TYPE, class T, class H> SPECIFIC_TYPE* Remove(ContainerMapList<TypeList<H, T> > &elements, SPECIFIC_TYPE *obj)
+    //{
+    //    // The head element is bad
+    //    SPECIFIC_TYPE* t = Remove(elements._elements, obj);
+    //    return ( t != NULL ? t : Remove(elements._TailElements, obj) );
+    //}
 }
 #endif
 
-- 
cgit v1.2.3