josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix a crash caused by invalid mapid in player save. Thanks to Visagalis

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-30 23:51:11 -05:00
parent d8971e58f2
commit 9b0c712946
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.cpp
+3 -3
View File
@@ -14822,9 +14822,9 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
_LoadBGData(holder->GetResult(PLAYER_LOGIN_QUERY_LOADBGDATA)); _LoadBGData(holder->GetResult(PLAYER_LOGIN_QUERY_LOADBGDATA));
MapEntry const * mapEntry = sMapStore.LookupEntry(mapId); MapEntry const * mapEntry = sMapStore.LookupEntry(mapId);
if(!IsPositionValid()) if(!mapEntry || !IsPositionValid())
{ {
sLog.outError("Player (guidlow %d) have invalid coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.",guid,GetPositionX(),GetPositionY(),GetPositionZ(),GetOrientation()); sLog.outError("Player (guidlow %d) have invalid coordinates (MapId: %u X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.",guid,mapId,GetPositionX(),GetPositionY(),GetPositionZ(),GetOrientation());
RelocateToHomebind(); RelocateToHomebind();
} }
// Player was saved in Arena or Bg // Player was saved in Arena or Bg
@@ -14950,7 +14950,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
// Map could be changed before // Map could be changed before
mapEntry = sMapStore.LookupEntry(mapId); mapEntry = sMapStore.LookupEntry(mapId);
// client without expansion support // client without expansion support
if(GetSession()->Expansion() < mapEntry->Expansion()) if(mapEntry && GetSession()->Expansion() < mapEntry->Expansion())
{ {
sLog.outDebug("Player %s using client without required expansion tried login at non accessible map %u", GetName(), mapId); sLog.outDebug("Player %s using client without required expansion tried login at non accessible map %u", GetName(), mapId);
RelocateToHomebind(); RelocateToHomebind();