diff options
author | Aokromes <aokromes@gmail.com> | 2015-10-16 00:02:55 +0200 |
---|---|---|
committer | Aokromes <aokromes@gmail.com> | 2015-10-16 00:02:55 +0200 |
commit | a589bbe854a9cdb0eaec710b4232ed9ed1b5f8d6 (patch) | |
tree | a804de6b36b3858df248035b2a9451a70873c764 /src/server/game/Handlers/CharacterHandler.cpp | |
parent | bdcfd5271c50f274261e4147a30d9ba2cb41f590 (diff) | |
parent | 45994a177c128dc83ea01b0697377f7b74b5c4ba (diff) |
Merge branch '6.x' of http://github.com/TrinityCore/TrinityCore into 6.x
Diffstat (limited to 'src/server/game/Handlers/CharacterHandler.cpp')
-rw-r--r-- | src/server/game/Handlers/CharacterHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index dbf6076efdc..31ec7e42bcf 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -1011,7 +1011,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder) } } - if (!pCurrChar->GetMap()->AddPlayerToMap(pCurrChar) || !pCurrChar->CheckInstanceLoginValid()) + if (!pCurrChar->GetMap()->AddPlayerToMap(pCurrChar)) { AreaTriggerStruct const* at = sObjectMgr->GetGoBackTrigger(pCurrChar->GetMapId()); if (at) |