1 files changed, 11 insertions, 6 deletions

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