From ccde296fd3822898e8959c009211fe880a0429f7 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Wed, 25 Feb 2009 17:53:05 -0600
Subject: *Fix some crash bugs.

--HG--
branch : trunk
---
 src/game/Object.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 0c8d12d132a..2d19e51e76e 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1538,7 +1538,7 @@ Map const* WorldObject::GetBaseMap() const
 
 void WorldObject::AddObjectToRemoveList()
 {
-    Map* map = GetMap();
+    Map* map = MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
     if(!map)
     {
         sLog.outError("Object (TypeId: %u Entry: %u GUID: %u) at attempt add to move list not have valid map (Id: %u).",GetTypeId(),GetEntry(),GetGUIDLow(),GetMapId());
-- 
cgit v1.2.3