summaryrefslogtreecommitdiffstats
path: root/src/BlockID.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2013-11-30 16:20:27 +0100
committerMattes D <github@xoft.cz>2013-11-30 16:20:27 +0100
commit2bbe5046e9d2119f2751af01cbce3185ee9514ed (patch)
tree059a36e4c22c22b1f6d591bc02ade598153015b4 /src/BlockID.h
parentChanged cBlockHandler->OnUpdate() to use cChunk directly. (diff)
parentFixed pistons extending (diff)
downloadcuberite-2bbe5046e9d2119f2751af01cbce3185ee9514ed.tar
cuberite-2bbe5046e9d2119f2751af01cbce3185ee9514ed.tar.gz
cuberite-2bbe5046e9d2119f2751af01cbce3185ee9514ed.tar.bz2
cuberite-2bbe5046e9d2119f2751af01cbce3185ee9514ed.tar.lz
cuberite-2bbe5046e9d2119f2751af01cbce3185ee9514ed.tar.xz
cuberite-2bbe5046e9d2119f2751af01cbce3185ee9514ed.tar.zst
cuberite-2bbe5046e9d2119f2751af01cbce3185ee9514ed.zip
Diffstat (limited to 'src/BlockID.h')
-rw-r--r--src/BlockID.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/BlockID.h b/src/BlockID.h
index e5f49fe2c..9742e9745 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -174,7 +174,7 @@ enum ENUM_BLOCK_ID
E_BLOCK_NEW_LEAVES = 161, // Acacia and Dark Oak IDs in Minecraft 1.7.x
E_BLOCK_NEW_LOG = 162,
E_BLOCK_ACACIA_WOOD_STAIRS = 163,
- E_BLOCK_DARK_OAK_WOOD_STAIRS = 164, /////////////////////////////////
+ E_BLOCK_DARK_OAK_WOOD_STAIRS = 164,
E_BLOCK_HAY_BALE = 170,
E_BLOCK_CARPET = 171,
E_BLOCK_HARDENED_CLAY = 172,
@@ -187,8 +187,7 @@ enum ENUM_BLOCK_ID
E_BLOCK_NUMBER_OF_TYPES, ///< Number of individual (different) blocktypes
E_BLOCK_MAX_TYPE_ID = E_BLOCK_NUMBER_OF_TYPES - 1, ///< Maximum BlockType number used
- // Synonym or ID compatibility
-
+ // Synonym or ID compatibility
E_BLOCK_YELLOW_FLOWER = E_BLOCK_DANDELION,
E_BLOCK_RED_ROSE = E_BLOCK_FLOWER,
E_BLOCK_LOCKED_CHEST = E_BLOCK_STAINED_GLASS,