summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-02-19 14:12:34 +0100
committerHowaner <franzi.moos@googlemail.com>2014-02-19 14:12:34 +0100
commit823ee3a125d1b57880eaa050d25e5bc71180506d (patch)
treeca37f874cbeb4c1106fa6f8e313469d2d8696af7
parentAdd Heads completely (diff)
downloadcuberite-823ee3a125d1b57880eaa050d25e5bc71180506d.tar
cuberite-823ee3a125d1b57880eaa050d25e5bc71180506d.tar.gz
cuberite-823ee3a125d1b57880eaa050d25e5bc71180506d.tar.bz2
cuberite-823ee3a125d1b57880eaa050d25e5bc71180506d.tar.lz
cuberite-823ee3a125d1b57880eaa050d25e5bc71180506d.tar.xz
cuberite-823ee3a125d1b57880eaa050d25e5bc71180506d.tar.zst
cuberite-823ee3a125d1b57880eaa050d25e5bc71180506d.zip
Diffstat (limited to '')
-rw-r--r--src/BlockEntities/SkullEntity.h14
-rw-r--r--src/Protocol/Protocol17x.cpp1
2 files changed, 8 insertions, 7 deletions
diff --git a/src/BlockEntities/SkullEntity.h b/src/BlockEntities/SkullEntity.h
index ffd84465f..3dc355623 100644
--- a/src/BlockEntities/SkullEntity.h
+++ b/src/BlockEntities/SkullEntity.h
@@ -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
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 4d55822fb..07b23e0ac 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -2282,6 +2282,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;
}