diff options
| author | madmaxoft <github@xoft.cz> | 2014-07-17 10:06:13 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-07-17 10:06:13 +0200 |
| commit | e66b81b3951680511f2bfffd12c8f96dbbb5865a (patch) | |
| tree | 5a5bcdad7cc8b70b65bc60a1a3d8f6eb7a85501a /src/ClientHandle.cpp | |
| parent | Merge remote-tracking branch 'origin/master' into potions (diff) | |
| parent | Another fix for excessive food drain (diff) | |
| download | cuberite-e66b81b3951680511f2bfffd12c8f96dbbb5865a.tar cuberite-e66b81b3951680511f2bfffd12c8f96dbbb5865a.tar.gz cuberite-e66b81b3951680511f2bfffd12c8f96dbbb5865a.tar.bz2 cuberite-e66b81b3951680511f2bfffd12c8f96dbbb5865a.tar.lz cuberite-e66b81b3951680511f2bfffd12c8f96dbbb5865a.tar.xz cuberite-e66b81b3951680511f2bfffd12c8f96dbbb5865a.tar.zst cuberite-e66b81b3951680511f2bfffd12c8f96dbbb5865a.zip | |
Diffstat (limited to 'src/ClientHandle.cpp')
| -rw-r--r-- | src/ClientHandle.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp index 4062d1f25..bd6fc1287 100644 --- a/src/ClientHandle.cpp +++ b/src/ClientHandle.cpp @@ -290,17 +290,18 @@ void cClientHandle::Kick(const AString & a_Reason) -void cClientHandle::Authenticate(const AString & a_Name, const AString & a_UUID) +void cClientHandle::Authenticate(const AString & a_Name, const AString & a_UUID, const Json::Value & a_Properties) { if (m_State != csAuthenticating) { return; } - ASSERT( m_Player == NULL ); + ASSERT(m_Player == NULL); m_Username = a_Name; m_UUID = a_UUID; + m_Properties = a_Properties; // Send login success (if the protocol supports it): m_Protocol->SendLoginSuccess(); @@ -324,7 +325,7 @@ void cClientHandle::Authenticate(const AString & a_Name, const AString & a_UUID) if (!cRoot::Get()->GetPluginManager()->CallHookPlayerJoined(*m_Player)) { cRoot::Get()->BroadcastChatJoin(Printf("%s has joined the game", GetUsername().c_str())); - LOGINFO("Player %s has joined the game.", m_Username.c_str()); + LOGINFO("Player %s has joined the game", m_Username.c_str()); } m_ConfirmPosition = m_Player->GetPosition(); |