aboutsummaryrefslogtreecommitdiff
path: root/src/game/MapInstanced.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-06-27 16:18:08 -0500
committermegamage <none@none>2009-06-27 16:18:08 -0500
commita363df18368dfa28412e51f40d71954f9d7a20fe (patch)
treed312c6144f92b61a9f12ab29a55281a779336b99 /src/game/MapInstanced.cpp
parent77cd4a8cb006cf80b6410523ce120b68a12ef550 (diff)
*Fix a crash caused by player saves with incorrect instance id.
--HG-- branch : trunk
Diffstat (limited to 'src/game/MapInstanced.cpp')
-rw-r--r--src/game/MapInstanced.cpp11
1 files changed, 1 insertions, 10 deletions
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)
{