Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 02:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Try to fix a crash caused by adding player to wrong instance.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-08 19:05:44 -05:00
parent 94d048311d
commit 2f83f6a79c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/Player.cpp
View File

@@ -14782,6 +14782,12 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
instanceId = 0;
}
// fix crash (because of if(Map *map = _FindMap(instanceId)) in MapInstanced::CreateInstance)
if(instanceId)
if(InstanceSave * save = GetInstanceSave(mapId))
if(save->GetInstanceId() != instanceId)
instanceId = 0;
// NOW player must have valid map
// load the player's map here if it's not already loaded
Map *map = MapManager::Instance().CreateMap(mapId, this, instanceId);