summaryrefslogtreecommitdiffstats
path: root/src/Server.cpp
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-07-17 10:06:13 +0200
committermadmaxoft <github@xoft.cz>2014-07-17 10:06:13 +0200
commite66b81b3951680511f2bfffd12c8f96dbbb5865a (patch)
tree5a5bcdad7cc8b70b65bc60a1a3d8f6eb7a85501a /src/Server.cpp
parentMerge remote-tracking branch 'origin/master' into potions (diff)
parentAnother fix for excessive food drain (diff)
downloadcuberite-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 '')
-rw-r--r--src/Server.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Server.cpp b/src/Server.cpp
index 9220731eb..17551eeb1 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -656,14 +656,14 @@ void cServer::KickUser(int a_ClientID, const AString & a_Reason)
-void cServer::AuthenticateUser(int a_ClientID, const AString & a_Name, const AString & a_UUID)
+void cServer::AuthenticateUser(int a_ClientID, const AString & a_Name, const AString & a_UUID, const Json::Value & a_Properties)
{
cCSLock Lock(m_CSClients);
for (ClientList::iterator itr = m_Clients.begin(); itr != m_Clients.end(); ++itr)
{
if ((*itr)->GetUniqueID() == a_ClientID)
{
- (*itr)->Authenticate(a_Name, a_UUID);
+ (*itr)->Authenticate(a_Name, a_UUID, a_Properties);
return;
}
} // for itr - m_Clients[]