diff options
Diffstat (limited to 'src/BlockEntities')
| -rw-r--r-- | src/BlockEntities/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/BlockEntities/MobHeadEntity.cpp | 43 | ||||
| -rw-r--r-- | src/BlockEntities/MobHeadEntity.h | 24 |
3 files changed, 57 insertions, 12 deletions
diff --git a/src/BlockEntities/CMakeLists.txt b/src/BlockEntities/CMakeLists.txt index fbf85d2af..6c164c4b4 100644 --- a/src/BlockEntities/CMakeLists.txt +++ b/src/BlockEntities/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 2.6) -project (MCServer) +project (Cuberite) include_directories ("${PROJECT_SOURCE_DIR}/../") diff --git a/src/BlockEntities/MobHeadEntity.cpp b/src/BlockEntities/MobHeadEntity.cpp index 3275bf7f2..542e920ba 100644 --- a/src/BlockEntities/MobHeadEntity.cpp +++ b/src/BlockEntities/MobHeadEntity.cpp @@ -14,8 +14,7 @@ cMobHeadEntity::cMobHeadEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) : super(E_BLOCK_HEAD, a_BlockX, a_BlockY, a_BlockZ, a_World), m_Type(SKULL_TYPE_SKELETON), - m_Rotation(SKULL_ROTATION_NORTH), - m_Owner("") + m_Rotation(SKULL_ROTATION_NORTH) { } @@ -35,9 +34,9 @@ bool cMobHeadEntity::UsedBy(cPlayer * a_Player) void cMobHeadEntity::SetType(const eMobHeadType & a_Type) { - if ((!m_Owner.empty()) && (a_Type != SKULL_TYPE_PLAYER)) + if ((!m_OwnerName.empty()) && (a_Type != SKULL_TYPE_PLAYER)) { - m_Owner = ""; + m_OwnerName = m_OwnerUUID = m_OwnerTexture = m_OwnerTextureSignature = ""; } m_Type = a_Type; } @@ -55,13 +54,43 @@ void cMobHeadEntity::SetRotation(eMobHeadRotation a_Rotation) -void cMobHeadEntity::SetOwner(const AString & a_Owner) +void cMobHeadEntity::SetOwner(const cPlayer & a_Owner) { - if ((a_Owner.length() > 16) || (m_Type != SKULL_TYPE_PLAYER)) + if (m_Type != SKULL_TYPE_PLAYER) { return; } - m_Owner = a_Owner; + + m_OwnerName = a_Owner.GetName(); + m_OwnerUUID = a_Owner.GetUUID(); + + const Json::Value & Properties = a_Owner.GetClientHandle()->GetProperties(); + for (auto & Node : Properties) + { + if (Node.get("name", "").asString() == "textures") + { + m_OwnerTexture = Node.get("value", "").asString(); + m_OwnerTextureSignature = Node.get("signature", "").asString(); + break; + } + } +} + + + + + +void cMobHeadEntity::SetOwner(const AString & a_OwnerUUID, const AString & a_OwnerName, const AString & a_OwnerTexture, const AString & a_OwnerTextureSignature) +{ + if (m_Type != SKULL_TYPE_PLAYER) + { + return; + } + + m_OwnerUUID = a_OwnerUUID; + m_OwnerName = a_OwnerName; + m_OwnerTexture = a_OwnerTexture; + m_OwnerTextureSignature = a_OwnerTextureSignature; } diff --git a/src/BlockEntities/MobHeadEntity.h b/src/BlockEntities/MobHeadEntity.h index f25cb3a16..2eb932068 100644 --- a/src/BlockEntities/MobHeadEntity.h +++ b/src/BlockEntities/MobHeadEntity.h @@ -39,8 +39,11 @@ public: /** Set the rotation of the mob head */ void SetRotation(eMobHeadRotation a_Rotation); - /** Set the player name for mob heads with player type */ - void SetOwner(const AString & a_Owner); + /** Set the player for mob heads with player type */ + void SetOwner(const cPlayer & a_Owner); + + /** Sets the player components for the mob heads with player type */ + void SetOwner(const AString & a_OwnerUUID, const AString & a_OwnerName, const AString & a_OwnerTexture, const AString & a_OwnerTextureSignature); /** Returns the type of the mob head */ eMobHeadType GetType(void) const { return m_Type; } @@ -49,7 +52,16 @@ public: eMobHeadRotation GetRotation(void) const { return m_Rotation; } /** Returns the player name of the mob head */ - AString GetOwner(void) const { return m_Owner; } + AString GetOwnerName(void) const { return m_OwnerName; } + + /** Returns the player UUID of the mob head */ + AString GetOwnerUUID(void) const { return m_OwnerUUID; } + + /** Returns the texture of the mob head */ + AString GetOwnerTexture(void) const { return m_OwnerTexture; } + + /** Returns the texture signature of the mob head */ + AString GetOwnerTextureSignature(void) const { return m_OwnerTextureSignature; } // tolua_end @@ -60,7 +72,11 @@ private: eMobHeadType m_Type; eMobHeadRotation m_Rotation; - AString m_Owner; + + AString m_OwnerName; + AString m_OwnerUUID; + AString m_OwnerTexture; + AString m_OwnerTextureSignature; } ; // tolua_export |