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.h | |
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.h')
-rw-r--r-- | src/ClientHandle.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/ClientHandle.h b/src/ClientHandle.h index 922740b11..ca39a01cd 100644 --- a/src/ClientHandle.h +++ b/src/ClientHandle.h @@ -20,6 +20,7 @@ #include "Map.h" #include "Enchantments.h" #include "UI/SlotArea.h" +#include "json/json.h" @@ -67,6 +68,8 @@ public: const AString & GetUUID(void) const { return m_UUID; } // tolua_export void SetUUID(const AString & a_UUID) { m_UUID = a_UUID; } + + const Json::Value & GetProperties(void) const { return m_Properties; } /** Generates an UUID based on the username stored for this client, and stores it in the m_UUID member. This is used for the offline (non-auth) mode, when there's no UUID source. @@ -91,8 +94,10 @@ public: static AString FormatChatPrefix(bool ShouldAppendChatPrefixes, AString a_ChatPrefixS, AString m_Color1, AString m_Color2); - void Kick(const AString & a_Reason); // tolua_export - void Authenticate(const AString & a_Name, const AString & a_UUID); // Called by cAuthenticator when the user passes authentication + void Kick(const AString & a_Reason); // tolua_export + + /** Authenticates the specified user, called by cAuthenticator */ + void Authenticate(const AString & a_Name, const AString & a_UUID, const Json::Value & a_Properties); void StreamChunks(void); @@ -280,6 +285,7 @@ private: AString m_Username; AString m_Password; + Json::Value m_Properties; cCriticalSection m_CSChunkLists; cChunkCoordsList m_LoadedChunks; // Chunks that the player belongs to |