diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-09-02 19:37:03 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-09-02 19:37:03 +0200 |
| commit | b8769e3fb48ce05f7a76e9e55b9d864f3474d311 (patch) | |
| tree | b2842e686fe509bf65d5b7df1f311706ce0de6f3 /src/BlockEntities | |
| parent | WebAdmin: Exported logo and background. (diff) | |
| parent | Re-added alternate spellings of darkgraywool. (diff) | |
| download | cuberite-b8769e3fb48ce05f7a76e9e55b9d864f3474d311.tar cuberite-b8769e3fb48ce05f7a76e9e55b9d864f3474d311.tar.gz cuberite-b8769e3fb48ce05f7a76e9e55b9d864f3474d311.tar.bz2 cuberite-b8769e3fb48ce05f7a76e9e55b9d864f3474d311.tar.lz cuberite-b8769e3fb48ce05f7a76e9e55b9d864f3474d311.tar.xz cuberite-b8769e3fb48ce05f7a76e9e55b9d864f3474d311.tar.zst cuberite-b8769e3fb48ce05f7a76e9e55b9d864f3474d311.zip | |
Diffstat (limited to 'src/BlockEntities')
| -rw-r--r-- | src/BlockEntities/CommandBlockEntity.cpp | 9 | ||||
| -rw-r--r-- | src/BlockEntities/FurnaceEntity.h | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/BlockEntities/CommandBlockEntity.cpp b/src/BlockEntities/CommandBlockEntity.cpp index dd0858378..20702a9ac 100644 --- a/src/BlockEntities/CommandBlockEntity.cpp +++ b/src/BlockEntities/CommandBlockEntity.cpp @@ -188,12 +188,11 @@ void cCommandBlockEntity::SaveToJson(Json::Value & a_Value) void cCommandBlockEntity::Execute() { - if (m_World != NULL) + ASSERT(m_World != NULL); // Execute should not be called before the command block is attached to a world + + if (!m_World->AreCommandBlocksEnabled()) { - if (!m_World->AreCommandBlocksEnabled()) - { - return; - } + return; } class CommandBlockOutCb : diff --git a/src/BlockEntities/FurnaceEntity.h b/src/BlockEntities/FurnaceEntity.h index 4f935a74b..cf1a755e0 100644 --- a/src/BlockEntities/FurnaceEntity.h +++ b/src/BlockEntities/FurnaceEntity.h @@ -105,7 +105,7 @@ protected: NIBBLETYPE m_BlockMeta; /// The recipe for the current input slot - const cFurnaceRecipe::Recipe * m_CurrentRecipe; + const cFurnaceRecipe::cRecipe * m_CurrentRecipe; /// The item that is being smelted cItem m_LastInput; |