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 45994a177c)
(cherry picked from commit c7bad70e55)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
This commit is contained in:
Shauren
2015-10-15 23:29:19 +02:00
committed by ariel-
parent 9fe26765b4
commit 7a5a4cb726

View File

@@ -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)