summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities/CommandBlockEntity.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2015-12-19 22:20:56 +0100
committerTiger Wang <ziwei.tiger@outlook.com>2015-12-19 22:20:56 +0100
commitb8752bb26e91bcdcebfb8dd43e5794251ff70a89 (patch)
tree95048f5a2a833c1d43785f6eaea070627c2b9ebe /src/BlockEntities/CommandBlockEntity.h
parentMerge pull request #2776 from cuberite/AtomicBoolIsthread (diff)
parentReorganised the redstone simulator (diff)
downloadcuberite-b8752bb26e91bcdcebfb8dd43e5794251ff70a89.tar
cuberite-b8752bb26e91bcdcebfb8dd43e5794251ff70a89.tar.gz
cuberite-b8752bb26e91bcdcebfb8dd43e5794251ff70a89.tar.bz2
cuberite-b8752bb26e91bcdcebfb8dd43e5794251ff70a89.tar.lz
cuberite-b8752bb26e91bcdcebfb8dd43e5794251ff70a89.tar.xz
cuberite-b8752bb26e91bcdcebfb8dd43e5794251ff70a89.tar.zst
cuberite-b8752bb26e91bcdcebfb8dd43e5794251ff70a89.zip
Diffstat (limited to 'src/BlockEntities/CommandBlockEntity.h')
-rw-r--r--src/BlockEntities/CommandBlockEntity.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/BlockEntities/CommandBlockEntity.h b/src/BlockEntities/CommandBlockEntity.h
index 0f93ff916..184211ce0 100644
--- a/src/BlockEntities/CommandBlockEntity.h
+++ b/src/BlockEntities/CommandBlockEntity.h
@@ -10,7 +10,6 @@
#pragma once
#include "BlockEntity.h"
-#include "RedstonePoweredEntity.h"
@@ -19,8 +18,7 @@
// tolua_begin
class cCommandBlockEntity :
- public cBlockEntity,
- public cRedstonePoweredEntity
+ public cBlockEntity
{
typedef cBlockEntity super;
@@ -43,9 +41,6 @@ public:
// tolua_begin
- /** Sets the internal redstone power flag to "on" or "off", depending on the parameter. Calls Activate() if appropriate */
- virtual void SetRedstonePower(bool a_IsPowered) override;
-
/** Sets the command block to execute a command in the next tick */
void Activate(void);
@@ -69,7 +64,6 @@ private:
void Execute();
bool m_ShouldExecute;
- bool m_IsPowered;
AString m_Command;