aboutsummaryrefslogtreecommitdiff
path: root/src/game/Map.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/Map.cpp')
-rw-r--r--src/game/Map.cpp12
1 files changed, 8 insertions, 4 deletions
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;
}