*Add virtual bool IsEscorted() to escort_ai.h

*Some minor cleanup and optimization

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 858d4591e5f..d9e2f139880 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -14944,9 +14944,9 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
             {
                 sLog.outError("Player (guidlow %d) was in BG in database, but BG was not found, and entry point was invalid! Teleport to default race/class locations.",guid);
                 RelocateToHomebind();
-            } else {
-                Relocate(&_loc);
             }
+            else
+                Relocate(&_loc);
 
             // We are not in BG anymore
             m_bgData.bgInstanceID = 0;