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

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

No files matched your search

+19
View File
@@ -14565,6 +14565,12 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
}
}
// In some old saves players' instance id are not correctly ordered
// This fixes the crash. But it is not needed for a new db
if(InstanceSave *pSave = GetInstanceSave(GetMapId()))
if(pSave->GetInstanceId() != GetInstanceId())
SetInstanceId(pSave->GetInstanceId());
// NOW player must have valid map
// load the player's map here if it's not already loaded
Map *map = GetMap();
@@ -15594,6 +15600,19 @@ InstancePlayerBind* Player::GetBoundInstance(uint32 mapid, uint8 difficulty)
return NULL;
}
InstanceSave * Player::GetInstanceSave(uint32 mapid)
{
InstancePlayerBind *pBind = GetBoundInstance(mapid, GetDifficulty());
InstanceSave *pSave = pBind ? pBind->save : NULL;
if(!pBind || !pBind->perm)
{
if(Group *group = GetGroup())
if(InstanceGroupBind *groupBind = group->GetBoundInstance(mapid, GetDifficulty()))
pSave = groupBind->save;
}
return pSave;
}
void Player::UnbindInstance(uint32 mapid, uint8 difficulty, bool unload)
{
BoundInstancesMap::iterator itr = m_boundInstances[difficulty].find(mapid);