diff options
| author | STRWarrior <niels.breuker@hotmail.nl> | 2014-02-03 22:30:32 +0100 |
|---|---|---|
| committer | STRWarrior <niels.breuker@hotmail.nl> | 2014-02-03 22:30:32 +0100 |
| commit | 70e48960acdbc09bedd4bbeb536e6aa46b50f82e (patch) | |
| tree | 71edc335e92b9120c2cf3dbf6e37cc3368c3fcf7 /src | |
| parent | Fixed some issues. (diff) | |
| download | cuberite-70e48960acdbc09bedd4bbeb536e6aa46b50f82e.tar cuberite-70e48960acdbc09bedd4bbeb536e6aa46b50f82e.tar.gz cuberite-70e48960acdbc09bedd4bbeb536e6aa46b50f82e.tar.bz2 cuberite-70e48960acdbc09bedd4bbeb536e6aa46b50f82e.tar.lz cuberite-70e48960acdbc09bedd4bbeb536e6aa46b50f82e.tar.xz cuberite-70e48960acdbc09bedd4bbeb536e6aa46b50f82e.tar.zst cuberite-70e48960acdbc09bedd4bbeb536e6aa46b50f82e.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/BlockID.h | 5 | ||||
| -rw-r--r-- | src/Blocks/BlockQuartz.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/BlockID.h b/src/BlockID.h index b31c589b9..612eee1fc 100644 --- a/src/BlockID.h +++ b/src/BlockID.h @@ -500,6 +500,11 @@ enum E_META_PLANKS_BIRCH = 2, E_META_PLANKS_JUNGLE = 3, + // E_BLOCK_QUARTZ_BLOCK metas: + E_META_QUARTZ_NORMAL = 0, + E_META_QUARTZ_CHISELLED = 1, + E_META_QUARTZ_PILLAR = 2, + // E_BLOCK_RAIL metas E_META_RAIL_ZM_ZP = 0, E_META_RAIL_XM_XP = 1, diff --git a/src/Blocks/BlockQuartz.h b/src/Blocks/BlockQuartz.h index 41f4e15a7..a9f8f9046 100644 --- a/src/Blocks/BlockQuartz.h +++ b/src/Blocks/BlockQuartz.h @@ -25,7 +25,7 @@ public: { a_BlockType = m_BlockType; NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage); - if (Meta != 0x2) // Check if the block is a pillar block. + if (Meta != E_META_QUARTZ_PILLAR) // Check if the block is a pillar block. { a_BlockMeta = Meta; return true; |