diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-09-30 20:59:59 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-09-30 20:59:59 +0200 |
| commit | 7d3016c7adc1a2d88447acfaf6c642ab25028a35 (patch) | |
| tree | 353159bcc8eff1e5e9f4eb3d809060ae7c73e7a6 | |
| parent | Fixed 1.8 dirt types (diff) | |
| download | cuberite-7d3016c7adc1a2d88447acfaf6c642ab25028a35.tar cuberite-7d3016c7adc1a2d88447acfaf6c642ab25028a35.tar.gz cuberite-7d3016c7adc1a2d88447acfaf6c642ab25028a35.tar.bz2 cuberite-7d3016c7adc1a2d88447acfaf6c642ab25028a35.tar.lz cuberite-7d3016c7adc1a2d88447acfaf6c642ab25028a35.tar.xz cuberite-7d3016c7adc1a2d88447acfaf6c642ab25028a35.tar.zst cuberite-7d3016c7adc1a2d88447acfaf6c642ab25028a35.zip | |
| -rw-r--r-- | src/Blocks/BlockDirt.h | 4 | ||||
| -rw-r--r-- | src/Blocks/BlockDoor.h | 5 | ||||
| -rw-r--r-- | src/Blocks/BlockTrapdoor.h | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/Blocks/BlockDirt.h b/src/Blocks/BlockDirt.h index b6d762dcf..19f889372 100644 --- a/src/Blocks/BlockDirt.h +++ b/src/Blocks/BlockDirt.h @@ -24,11 +24,11 @@ public: if (a_BlockMeta == E_META_DIRT_COARSE) { // Drop the coarse block (dirt, meta 1) - a_Pickups.Add(E_BLOCK_DIRT, 1, 1); + a_Pickups.Add(E_BLOCK_DIRT, 1, E_META_DIRT_COARSE); } else { - a_Pickups.Add(E_BLOCK_DIRT, 1, 0); + a_Pickups.Add(E_BLOCK_DIRT, 1, E_META_DIRT_NORMAL); } } diff --git a/src/Blocks/BlockDoor.h b/src/Blocks/BlockDoor.h index 7e46feec4..92ad8da12 100644 --- a/src/Blocks/BlockDoor.h +++ b/src/Blocks/BlockDoor.h @@ -185,8 +185,11 @@ public: { return true; } + default: + { + return false; + } } - return false; } diff --git a/src/Blocks/BlockTrapdoor.h b/src/Blocks/BlockTrapdoor.h index d3f3c9a38..8c96de0f1 100644 --- a/src/Blocks/BlockTrapdoor.h +++ b/src/Blocks/BlockTrapdoor.h @@ -31,6 +31,7 @@ public: { if (m_BlockType == E_BLOCK_IRON_TRAPDOOR) { + // Iron doors can only be toggled by redstone, not by right-clicking return; } |