summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities/CommandBlockEntity.h
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-09-11 18:48:21 +0200
committerTycho <work.tycho+git@gmail.com>2014-09-11 18:48:21 +0200
commit0b044e1c83a62c266afaf0852ccbd5e7b01cec5e (patch)
treed847314a2ee95b1a766dbb57a06b5ea7e42e687c /src/BlockEntities/CommandBlockEntity.h
parentMerge branch 'master' of https://github.com/mc-server/MCServer (diff)
downloadcuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar
cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.gz
cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.bz2
cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.lz
cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.xz
cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.zst
cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.zip
Diffstat (limited to 'src/BlockEntities/CommandBlockEntity.h')
-rw-r--r--src/BlockEntities/CommandBlockEntity.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/BlockEntities/CommandBlockEntity.h b/src/BlockEntities/CommandBlockEntity.h
index d02bf7d7b..22cd44322 100644
--- a/src/BlockEntities/CommandBlockEntity.h
+++ b/src/BlockEntities/CommandBlockEntity.h
@@ -10,7 +10,7 @@
#pragma once
#include "BlockEntity.h"
-
+#include "RedstonePoweredEntity.h"
@@ -27,7 +27,8 @@ namespace Json
// tolua_begin
class cCommandBlockEntity :
- public cBlockEntity
+ public cBlockEntity,
+ public cRedstonePoweredEntity
{
typedef cBlockEntity super;
@@ -52,7 +53,7 @@ public:
// tolua_begin
/// Sets the internal redstone power flag to "on" or "off", depending on the parameter. Calls Activate() if appropriate
- void SetRedstonePower(bool a_IsPowered);
+ virtual void SetRedstonePower(bool a_IsPowered) override;
/// Sets the command block to execute a command in the next tick
void Activate(void);