4 files changed, 55 insertions, 37 deletions

diff --git a/src/Entities/HangingEntity.cpp b/src/Entities/HangingEntity.cpp
index 3276bc4a0..a6b9c40c8 100644
--- a/src/Entities/HangingEntity.cpp
+++ b/src/Entities/HangingEntity.cpp
@@ -9,9 +9,9 @@
 
 
 
-cHangingEntity::cHangingEntity(eEntityType a_EntityType, eBlockFace a_BlockFace, double a_X, double a_Y, double a_Z)
-	: cEntity(a_EntityType, a_X, a_Y, a_Z, 0.8, 0.8)
-	, m_BlockFace(a_BlockFace)
+cHangingEntity::cHangingEntity(eEntityType a_EntityType, eBlockFace a_Facing, double a_X, double a_Y, double a_Z) :
+	cEntity(a_EntityType, a_X, a_Y, a_Z, 0.8, 0.8),
+	m_Facing(a_Facing)
 {
 	SetMaxHealth(1);
 	SetHealth(1);
@@ -21,15 +21,23 @@ cHangingEntity::cHangingEntity(eEntityType a_EntityType, eBlockFace a_BlockFace,
 
 
 
-void cHangingEntity::SetDirection(eBlockFace a_BlockFace)
+void cHangingEntity::SetFacing(eBlockFace a_Facing)
 {
-	if ((a_BlockFace < 2) || (a_BlockFace > 5))
+	// Y-based faces are not allowed:
+	switch (a_Facing)
 	{
-		ASSERT(!"Tried to set a bad direction!");
-		return;
+		case BLOCK_FACE_NONE:
+		case BLOCK_FACE_YM:
+		case BLOCK_FACE_YP:
+		{
+			LOGWARNING("%s: Invalid facing: %d. Ignoring.", __FUNCTION__, a_Facing);
+			ASSERT(!"Tried to set a bad facing!");
+			return;
+		}
+		default: break;
 	}
 
-	m_BlockFace = a_BlockFace;
+	m_Facing = a_Facing;
 }
 
 
@@ -41,7 +49,7 @@ void cHangingEntity::SpawnOn(cClientHandle & a_ClientHandle)
 	int Dir = 0;
 
 	// The client uses different values for item frame directions and block faces. Our constants are for the block faces, so we convert them here to item frame faces
-	switch (m_BlockFace)
+	switch (m_Facing)
 	{
 		case BLOCK_FACE_ZP: Dir = 0; break;
 		case BLOCK_FACE_ZM: Dir = 2; break;
@@ -49,8 +57,8 @@ void cHangingEntity::SpawnOn(cClientHandle & a_ClientHandle)
 		case BLOCK_FACE_XP: Dir = 3; break;
 		default:
 		{
-			LOGINFO("Invalid face (%d) in a cHangingEntity at {%d, %d, %d}, adjusting to BLOCK_FACE_XP.",
-				m_BlockFace, (int)GetPosX(), (int)GetPosY(), (int)GetPosZ()
+			LOGINFO("Invalid facing (%d) in a cHangingEntity at {%d, %d, %d}, adjusting to BLOCK_FACE_XP.",
+				m_Facing, (int)GetPosX(), (int)GetPosY(), (int)GetPosZ()
 			);
 			Dir = 3;
 		}
diff --git a/src/Entities/HangingEntity.h b/src/Entities/HangingEntity.h
index 1cc0034e1..67146a20b 100644
--- a/src/Entities/HangingEntity.h
+++ b/src/Entities/HangingEntity.h
@@ -11,36 +11,41 @@
 class cHangingEntity :
 	public cEntity
 {
-	// tolua_end
 	typedef cEntity super;
 
 public:
 
+	// tolua_end
+
 	CLASS_PROTODEF(cHangingEntity)
 
 	cHangingEntity(eEntityType a_EntityType, eBlockFace a_BlockFace, double a_X, double a_Y, double a_Z);
 	
-	/** Returns the orientation from the hanging entity */
-	eBlockFace GetDirection() const { return m_BlockFace; }  // tolua_export
+	// tolua_begin
+
+	/** Returns the direction in which the entity is facing. */
+	eBlockFace GetFacing() const { return m_Facing; }
 	
-	/** Set the orientation from the hanging entity */
-	void SetDirection(eBlockFace a_BlockFace);  // tolua_export
+	/** Set the direction in which the entity is facing. */
+	void SetFacing(eBlockFace a_Facing);
 	
-	/** Returns the X coord. */
-	int GetTileX() const { return POSX_TOINT; }  // tolua_export
+	/** Returns the X coord of the block in which the entity resides. */
+	int GetBlockX() const { return POSX_TOINT; }
 	
-	/** Returns the Y coord. */
-	int GetTileY() const { return POSY_TOINT; }  // tolua_export
+	/** Returns the Y coord of the block in which the entity resides. */
+	int GetBlockY() const { return POSY_TOINT; }
 	
-	/** Returns the Z coord. */
-	int GetTileZ() const { return POSZ_TOINT; }  // tolua_export
+	/** Returns the Z coord of the block in which the entity resides. */
+	int GetBlockZ() const { return POSZ_TOINT; }
+
+	// tolua_end
 
 private:
 
 	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override {}
 
-	eBlockFace m_BlockFace;
+	eBlockFace m_Facing;
 
 };  // tolua_export
 
diff --git a/src/Entities/ItemFrame.cpp b/src/Entities/ItemFrame.cpp
index f512324eb..6704c05b4 100644
--- a/src/Entities/ItemFrame.cpp
+++ b/src/Entities/ItemFrame.cpp
@@ -9,10 +9,10 @@
 
 
 
-cItemFrame::cItemFrame(eBlockFace a_BlockFace, double a_X, double a_Y, double a_Z)
-	: cHangingEntity(etItemFrame, a_BlockFace, a_X, a_Y, a_Z)
-	, m_Item(E_BLOCK_AIR)
-	, m_Rotation(0)
+cItemFrame::cItemFrame(eBlockFace a_BlockFace, double a_X, double a_Y, double a_Z) :
+	cHangingEntity(etItemFrame, a_BlockFace, a_X, a_Y, a_Z),
+	m_Item(E_BLOCK_AIR),
+	m_ItemRotation(0)
 {
 }
 
@@ -27,10 +27,10 @@ void cItemFrame::OnRightClicked(cPlayer & a_Player)
 	if (!m_Item.IsEmpty())
 	{
 		// Item not empty, rotate, clipping values to zero to three inclusive
-		m_Rotation++;
-		if (m_Rotation >= 8)
+		m_ItemRotation++;
+		if (m_ItemRotation >= 8)
 		{
-			m_Rotation = 0;
+			m_ItemRotation = 0;
 		}
 	}
 	else if (!a_Player.GetEquippedItem().IsEmpty())
@@ -72,7 +72,7 @@ void cItemFrame::KilledBy(TakeDamageInfo & a_TDI)
 
 	SetHealth(GetMaxHealth());
 	m_Item.Empty();
-	m_Rotation = 0;
+	m_ItemRotation = 0;
 	SetInvulnerableTicks(0);
 	GetWorld()->BroadcastEntityMetadata(*this);
 }
diff --git a/src/Entities/ItemFrame.h b/src/Entities/ItemFrame.h
index a63b78b70..3642662f9 100644
--- a/src/Entities/ItemFrame.h
+++ b/src/Entities/ItemFrame.h
@@ -11,26 +11,31 @@
 class cItemFrame :
 	public cHangingEntity
 {
-	// tolua_end
 	typedef cHangingEntity super;
 
 public:
 
+	// tolua_end
+
 	CLASS_PROTODEF(cItemFrame)
 
 	cItemFrame(eBlockFace a_BlockFace, double a_X, double a_Y, double a_Z);
 
+	// tolua_begin
+
 	/** Returns the item in the frame */
-	const cItem & GetItem(void) { return m_Item; }                  // tolua_export
+	const cItem & GetItem(void) { return m_Item; }
 
 	/** Set the item in the frame */
-	void SetItem(cItem & a_Item) { m_Item = a_Item; }               // tolua_export
+	void SetItem(cItem & a_Item) { m_Item = a_Item; }
 
 	/** Returns the rotation from the item in the frame */
-	Byte GetRotation(void) const { return m_Rotation; }             // tolua_export
+	Byte GetItemRotation(void) const { return m_ItemRotation; }
 
 	/** Set the rotation from the item in the frame */
-	void SetRotation(Byte a_Rotation) { m_Rotation = a_Rotation; }  // tolua_export
+	void SetRotation(Byte a_ItemRotation) { m_ItemRotation = a_ItemRotation; }
+
+	// tolua_end
 
 private:
 
@@ -39,7 +44,7 @@ private:
 	virtual void GetDrops(cItems & a_Items, cEntity * a_Killer) override;
 
 	cItem m_Item;
-	Byte m_Rotation;
+	Byte m_ItemRotation;
 
 };  // tolua_export