diff options
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 278d43ebc30..184e4ae697c 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -13914,6 +13914,37 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder ) // load the player's map here if it's not already loaded Map *map = GetMap(); + if (!map) + { + AreaTrigger const* at = objmgr.GetGoBackTrigger(GetMapId()); + if(at) + { + SetMapId(at->target_mapId); + Relocate(at->target_X, at->target_Y, at->target_Z, GetOrientation()); + } + else + { + SetMapId(m_homebindMapId); + Relocate(m_homebindX, m_homebindY, m_homebindZ, GetOrientation()); + } + + map = GetMap(); + if(!map) + { + sLog.outError("ERROR: 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()); + + SetMapId(info->mapId); + Relocate(info->positionX,info->positionY,info->positionZ,0.0f); + + map = GetMap(); + if(!map) + { + sLog.outError("ERROR: 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("CRASH."); + assert(false); + } + } + } // since the player may not be bound to the map yet, make sure subsequent // getmap calls won't create new maps SetInstanceId(map->GetInstanceId()); |