summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities/CommandBlockEntity.h
diff options
context:
space:
mode:
authorandrew <xdotftw@gmail.com>2014-01-18 20:27:54 +0100
committerandrew <xdotftw@gmail.com>2014-01-18 20:27:54 +0100
commita037172465932de7d0d7d725c3c8ec5b2fa44029 (patch)
treee59a7444acc471f4cd2e5e834212a2756b97d4ea /src/BlockEntities/CommandBlockEntity.h
parentMerge branch 'master' of https://github.com/mc-server/MCServer (diff)
downloadcuberite-a037172465932de7d0d7d725c3c8ec5b2fa44029.tar
cuberite-a037172465932de7d0d7d725c3c8ec5b2fa44029.tar.gz
cuberite-a037172465932de7d0d7d725c3c8ec5b2fa44029.tar.bz2
cuberite-a037172465932de7d0d7d725c3c8ec5b2fa44029.tar.lz
cuberite-a037172465932de7d0d7d725c3c8ec5b2fa44029.tar.xz
cuberite-a037172465932de7d0d7d725c3c8ec5b2fa44029.tar.zst
cuberite-a037172465932de7d0d7d725c3c8ec5b2fa44029.zip
Diffstat (limited to 'src/BlockEntities/CommandBlockEntity.h')
-rw-r--r--src/BlockEntities/CommandBlockEntity.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/BlockEntities/CommandBlockEntity.h b/src/BlockEntities/CommandBlockEntity.h
index c4529a1e6..12157670f 100644
--- a/src/BlockEntities/CommandBlockEntity.h
+++ b/src/BlockEntities/CommandBlockEntity.h
@@ -9,8 +9,7 @@
#pragma once
-#include "BlockEntityWithItems.h"
-#include "../UI/WindowOwner.h"
+#include "BlockEntity.h"
@@ -28,8 +27,7 @@ namespace Json
// tolua_begin
class cCommandBlockEntity :
- public cBlockEntity,
- public cBlockEntityWindowOwner
+ public cBlockEntity
{
typedef cBlockEntity super;
@@ -39,7 +37,6 @@ public:
/// Creates a new empty command block entity
cCommandBlockEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);
- virtual ~cCommandBlockEntity();
bool LoadFromJson( const Json::Value& a_Value );
virtual void SaveToJson(Json::Value& a_Value ) override;