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

Add break to Protocol17x.cpp and use new comment delimiter

This commit is contained in:
Howaner 2014-02-19 14:12:34 +01:00 committed by TheJumper
parent 7bc5946883
commit a71e8be4d2
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BlockEntities/SkullEntity.h
View File

@ -34,7 +34,7 @@ public:
// tolua_end
/// Creates a new skull entity at the specified block coords. a_World may be NULL
/** Creates a new skull entity at the specified block coords. a_World may be NULL */
cSkullEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
bool LoadFromJson( const Json::Value& a_Value );
@ -42,22 +42,22 @@ public:
// tolua_begin
/// Set the Skull Type
/** Set the Skull Type */
void SetSkullType(const eSkullType & a_SkullType);
/// Set the Rotation
/** Set the Rotation */
void SetRotation(eSkullRotation a_Rotation);
// Set the Player Name for Player Skulls
/** Set the Player Name for Player Skull */
void SetOwner(const AString & a_Owner);
/// Get the Skull Type
/** Get the Skull Type */
eSkullType GetSkullType(void) const { return m_SkullType; }
/// Get the Rotation
/** Get the Rotation */
eSkullRotation GetRotation(void) const { return m_Rotation; }
/// Get the setted Player Name
/** Get the setted Player Name */
AString GetOwner(void) const { return m_Owner; }
// tolua_end

1
src/Protocol/Protocol17x.cpp
View File

@ -2298,6 +2298,7 @@ void cProtocol172::cPacketizer::WriteBlockEntity(const cBlockEntity & a_BlockEnt
Writer.AddByte("Rot", SkullEntity.GetRotation() & 0xFF);
Writer.AddString("ExtraType", SkullEntity.GetOwner().c_str());
Writer.AddString("id", "Skull"); // "Tile Entity ID" - MC wiki; vanilla server always seems to send this though
break;
}
default: break;
}