From a363df18368dfa28412e51f40d71954f9d7a20fe Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sat, 27 Jun 2009 16:18:08 -0500
Subject: *Fix a crash caused by player saves with incorrect instance id.

--HG--
branch : trunk
---
 src/game/MapInstanced.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

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

diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp
index ca106d6506c..ee668e9080a 100644
--- a/src/game/MapInstanced.cpp
+++ b/src/game/MapInstanced.cpp
@@ -146,16 +146,7 @@ Map* MapInstanced::GetInstance(const WorldObject* obj)
             return NULL;
     }
 
-    InstancePlayerBind *pBind = player->GetBoundInstance(GetId(), player->GetDifficulty());
-    InstanceSave *pSave = pBind ? pBind->save : NULL;
-    if(!pBind || !pBind->perm)
-    {
-        if(Group *group = player->GetGroup())
-            if(InstanceGroupBind *groupBind = group->GetBoundInstance(GetId(), player->GetDifficulty()))
-                pSave = groupBind->save;
-    }
-
-    if(pSave)
+    if(InstanceSave *pSave = player->GetInstanceSave(GetId()))
     {
         if(!instanceId)
         {
-- 
cgit v1.2.3