*Fix a crash caused by player saves with incorrect instance id.
--HG-- branch : trunk
This commit is contained in:
1 parent
77cd4a8cb0
commit
a363df1836
3 files changed
+21
-10
No files matched your search
@@ -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)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user