From a0ba7426c6bc2059d5db6d248ef8e582e40ce4b3 Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Wed, 6 Aug 2014 13:17:05 +0100
Subject: Fixed multiple inhertance being output by tolua

---
 src/BlockEntities/NoteEntity.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/BlockEntities/NoteEntity.h')

diff --git a/src/BlockEntities/NoteEntity.h b/src/BlockEntities/NoteEntity.h
index f9db6cbe6..dd201e0a9 100644
--- a/src/BlockEntities/NoteEntity.h
+++ b/src/BlockEntities/NoteEntity.h
@@ -30,8 +30,10 @@ enum ENUM_NOTE_INSTRUMENTS
 // tolua_begin
 
 class cNoteEntity :
-	public cBlockEntity,
-	public cRedstonePoweredEntity
+	public cBlockEntity
+	// tolua_end
+	, public cRedstonePoweredEntity
+	// tolua_begin
 {
 	typedef cBlockEntity super;
 public:
-- 
cgit v1.2.3