diff options
Diffstat (limited to '')
| -rw-r--r-- | src/Entities/Player.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 5b0aa84a8..5c08151c8 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -8,6 +8,8 @@ #include "../Statistics.h" +#include "../UUID.h" + @@ -488,14 +490,14 @@ public: /** Whether placing the given blocks would intersect any entitiy */ bool DoesPlacingBlocksIntersectEntity(const sSetBlockVector & a_Blocks); + /** Returns the UUID that has been read from the client, or nil if not available. */ + const cUUID & GetUUID(void) const { return m_UUID; } // Exported in ManualBindings.cpp + // tolua_begin /** Returns wheter the player can fly or not. */ virtual bool CanFly(void) const { return m_CanFly; } - /** Returns the UUID (short format) that has been read from the client, or empty string if not available. */ - const AString & GetUUID(void) const { return m_UUID; } - /** (Re)loads the rank and permissions from the cRankManager. Expects the m_UUID member to be valid. Loads the m_Rank, m_Permissions, m_MsgPrefix, m_MsgSuffix and m_MsgNameColorCode members. */ @@ -694,9 +696,9 @@ protected: */ bool m_bIsTeleporting; - /** The short UUID (no dashes) of the player, as read from the ClientHandle. - If no ClientHandle is given, the UUID is initialized to empty. */ - AString m_UUID; + /** The UUID of the player, as read from the ClientHandle. + If no ClientHandle is given, the UUID is nil. */ + cUUID m_UUID; AString m_CustomName; @@ -731,7 +733,7 @@ protected: /** Returns the filename for the player data based on the UUID given. This can be used both for online and offline UUIDs. */ - AString GetUUIDFileName(const AString & a_UUID); + AString GetUUIDFileName(const cUUID & a_UUID); private: |