diff options
| author | madmaxoft <github@xoft.cz> | 2014-09-01 13:33:17 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-09-01 13:33:17 +0200 |
| commit | 1e60265a909884df3c440e298d1400889c07b5fb (patch) | |
| tree | 881444a9911c86ce40e5cbb051552fb2f43d9c68 /src/BlockEntities/CommandBlockEntity.cpp | |
| parent | Removed isDone check (diff) | |
| download | cuberite-1e60265a909884df3c440e298d1400889c07b5fb.tar cuberite-1e60265a909884df3c440e298d1400889c07b5fb.tar.gz cuberite-1e60265a909884df3c440e298d1400889c07b5fb.tar.bz2 cuberite-1e60265a909884df3c440e298d1400889c07b5fb.tar.lz cuberite-1e60265a909884df3c440e298d1400889c07b5fb.tar.xz cuberite-1e60265a909884df3c440e298d1400889c07b5fb.tar.zst cuberite-1e60265a909884df3c440e298d1400889c07b5fb.zip | |
Diffstat (limited to 'src/BlockEntities/CommandBlockEntity.cpp')
| -rw-r--r-- | src/BlockEntities/CommandBlockEntity.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/BlockEntities/CommandBlockEntity.cpp b/src/BlockEntities/CommandBlockEntity.cpp index 43cdb92fb..20702a9ac 100644 --- a/src/BlockEntities/CommandBlockEntity.cpp +++ b/src/BlockEntities/CommandBlockEntity.cpp @@ -188,7 +188,8 @@ void cCommandBlockEntity::SaveToJson(Json::Value & a_Value) void cCommandBlockEntity::Execute() { - ASSERT(m_World != NULL); //Execute should not be called before the command block is attached to a world + ASSERT(m_World != NULL); // Execute should not be called before the command block is attached to a world + if (!m_World->AreCommandBlocksEnabled()) { return; |