From a8a3d38cbb30b0e8f3974834947a4a8a43236859 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Tue, 9 Dec 2008 12:15:49 -0600
Subject: *Fix the crash bug that trying to teleport player home when homebind
 is not loaded.

--HG--
branch : trunk
---
 src/game/Player.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 99c1e398f08..e5c046034f4 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -13910,6 +13910,9 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
         m_movementInfo.t_o = 0.0f;
     }
 
+    if(!_LoadHomeBind(holder->GetResult(PLAYER_LOGIN_QUERY_LOADHOMEBIND)))
+        return false;
+
     // load the player's map here if it's not already loaded
     Map *map = GetMap();
     if (!map)
@@ -14170,8 +14173,8 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
 
     m_social = sSocialMgr.LoadFromDB(holder->GetResult(PLAYER_LOGIN_QUERY_LOADSOCIALLIST), GetGUIDLow());
 
-    if(!_LoadHomeBind(holder->GetResult(PLAYER_LOGIN_QUERY_LOADHOMEBIND)))
-        return false;
+    //if(!_LoadHomeBind(holder->GetResult(PLAYER_LOGIN_QUERY_LOADHOMEBIND)))
+    //    return false;
 
     // check PLAYER_CHOSEN_TITLE compatibility with PLAYER__FIELD_KNOWN_TITLES
     // note: PLAYER__FIELD_KNOWN_TITLES updated at quest status loaded
-- 
cgit v1.2.3