*Fix a crash caused by player saves with incorrect instance id.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-06-27 16:18:08 -05:00
parent 77cd4a8cb0
commit a363df1836
3 changed files with 21 additions and 10 deletions

View File

@@ -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)
{