From e3eba9331ee21011049c6ef4cdaa101144ed9c47 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Tue, 3 Mar 2009 19:07:52 -0600
Subject: *Fix a crash.

--HG--
branch : trunk
---
 src/game/Map.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/game/Map.cpp')

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index cb472947169..1bb000b6d80 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -339,19 +339,23 @@ void Map::SwitchGridContainers(T* obj, bool on)
 
     if(on)
     {
-        if(!grid.RemoveGridObject<T>(obj, obj->GetGUID())
+        grid.RemoveGridObject<T>(obj, obj->GetGUID());
+        grid.AddWorldObject<T>(obj, obj->GetGUID());
+        /*if(!grid.RemoveGridObject<T>(obj, obj->GetGUID())
             || !grid.AddWorldObject<T>(obj, obj->GetGUID()))
         {
             assert(false);
-        }
+        }*/
     }
     else
     {
-        if(!grid.RemoveWorldObject<T>(obj, obj->GetGUID())
+        grid.RemoveWorldObject<T>(obj, obj->GetGUID());
+        grid.AddGridObject<T>(obj, obj->GetGUID());
+        /*if(!grid.RemoveWorldObject<T>(obj, obj->GetGUID())
             || !grid.AddGridObject<T>(obj, obj->GetGUID()))
         {
             assert(false);
-        }
+        }*/
     }
     obj->IsTempWorldObject = on;
 }
-- 
cgit v1.2.3