diff options
author | Mattes D <github@xoft.cz> | 2015-04-03 15:41:39 +0200 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2015-04-03 15:41:39 +0200 |
commit | afdd751fe33bc3d97c3b6e9cf38aed38c1fb0de9 (patch) | |
tree | 18751d095c4ea4da6eb05616419da16ad6753fbd /src/Blocks | |
parent | Merge pull request #1845 from birkett/master (diff) | |
parent | Removed 0x6, 0x7 from BlockButton. (diff) | |
download | cuberite-afdd751fe33bc3d97c3b6e9cf38aed38c1fb0de9.tar cuberite-afdd751fe33bc3d97c3b6e9cf38aed38c1fb0de9.tar.gz cuberite-afdd751fe33bc3d97c3b6e9cf38aed38c1fb0de9.tar.bz2 cuberite-afdd751fe33bc3d97c3b6e9cf38aed38c1fb0de9.tar.lz cuberite-afdd751fe33bc3d97c3b6e9cf38aed38c1fb0de9.tar.xz cuberite-afdd751fe33bc3d97c3b6e9cf38aed38c1fb0de9.tar.zst cuberite-afdd751fe33bc3d97c3b6e9cf38aed38c1fb0de9.zip |
Diffstat (limited to 'src/Blocks')
-rw-r--r-- | src/Blocks/BlockButton.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h index 8e4f04740..d24c7d952 100644 --- a/src/Blocks/BlockButton.h +++ b/src/Blocks/BlockButton.h @@ -61,14 +61,16 @@ public: { switch (a_BlockFace) { + case BLOCK_FACE_YP: return 0x5; case BLOCK_FACE_ZM: return 0x4; case BLOCK_FACE_ZP: return 0x3; case BLOCK_FACE_XM: return 0x2; case BLOCK_FACE_XP: return 0x1; + case BLOCK_FACE_YM: return 0x0; default: { ASSERT(!"Unhandled block face!"); - return 0x0; // No idea, give a special meta (button in centre of block) + return 0x0; } } } @@ -77,10 +79,12 @@ public: { switch (a_Meta & 0x7) { + case 0x0: return BLOCK_FACE_YM; case 0x1: return BLOCK_FACE_XP; case 0x2: return BLOCK_FACE_XM; case 0x3: return BLOCK_FACE_ZP; case 0x4: return BLOCK_FACE_ZM; + case 0x5: return BLOCK_FACE_YP; default: { ASSERT(!"Unhandled block meta!"); |