flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Changed the format of the MobHead data to allow MobHeads working on MInecraft 1.8

Browse Source 
The NBT format now carries the texture data and transmit it to the client.
See: http://minecraft.gamepedia.com/Head#Block_entity
Related to #2674
This commit is contained in:
bibo38
2016-01-11 17:55:32 +01:00
parent 725db4475c
commit 657b0ed007
7 changed files with 130 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/BlockEntities/MobHeadEntity.cpp
View File

@@ -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;
}