diff options
author | worktycho <work.tycho@gmail.com> | 2014-09-26 17:04:26 +0200 |
---|---|---|
committer | worktycho <work.tycho@gmail.com> | 2014-09-26 17:04:26 +0200 |
commit | 411c69b420acdc1e103a76a1a52e2c488aee5718 (patch) | |
tree | 06e33fb4b17d9c782ebb834a9821571f11ae103c /src/BlockEntities/CommandBlockEntity.h | |
parent | Improved searching for spawn. (diff) | |
parent | Merge branch 'master' into redstoneTests (diff) | |
download | cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.gz cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.bz2 cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.lz cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.xz cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.zst cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.zip |
Diffstat (limited to 'src/BlockEntities/CommandBlockEntity.h')
-rw-r--r-- | src/BlockEntities/CommandBlockEntity.h | 7 |
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); |