From 7a5a4cb7267c91ba8d81020f36ea4d09eb4cefc9 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 15 Oct 2015 23:29:19 +0200 Subject: [PATCH] Core/Players: Check if player can enter the instance during login before trying to add him to map * Fixes name displaying as "Unknown" (cherry picked from commit 45994a177c128dc83ea01b0697377f7b74b5c4ba) (cherry picked from commit c7bad70e55e02fa4270f225e2dc42fd080db4abd) Conflicts: src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h --- src/server/game/Handlers/CharacterHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index f8693bcec3c..c9d21ec9a32 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -969,7 +969,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)