diff options
| author | nesco <emmanuel@federbusch.fr> | 2013-11-13 14:29:18 +0100 |
|---|---|---|
| committer | nesco <emmanuel@federbusch.fr> | 2013-11-13 14:29:18 +0100 |
| commit | e671f29d852f521d0434882373ee154b1fcd805c (patch) | |
| tree | 74e9a3f1f82dc11cb554b5a12fc70ef2377bf136 /source | |
| parent | compatibility update (diff) | |
| download | cuberite-e671f29d852f521d0434882373ee154b1fcd805c.tar cuberite-e671f29d852f521d0434882373ee154b1fcd805c.tar.gz cuberite-e671f29d852f521d0434882373ee154b1fcd805c.tar.bz2 cuberite-e671f29d852f521d0434882373ee154b1fcd805c.tar.lz cuberite-e671f29d852f521d0434882373ee154b1fcd805c.tar.xz cuberite-e671f29d852f521d0434882373ee154b1fcd805c.tar.zst cuberite-e671f29d852f521d0434882373ee154b1fcd805c.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/BlockID.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/BlockID.h b/source/BlockID.h index 7596f16a5..95b8ed9fc 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -40,10 +40,8 @@ enum ENUM_BLOCK_ID E_BLOCK_PISTON_EXTENSION = 34, E_BLOCK_WOOL = 35, E_BLOCK_PISTON_MOVED_BLOCK = 36, - E_BLOCK_DANDELION = 37, // Minecraft 1.7.x IDs + E_BLOCK_DANDELION = 37, E_BLOCK_FLOWER = 38, - E_BLOCK_YELLOW_FLOWER = 37, - E_BLOCK_RED_ROSE = 38, // Older IDs E_BLOCK_BROWN_MUSHROOM = 39, E_BLOCK_RED_MUSHROOM = 40, E_BLOCK_GOLD_BLOCK = 41, @@ -188,6 +186,12 @@ enum ENUM_BLOCK_ID // IsValidBlock() depends on this 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 + + E_BLOCK_YELLOW_FLOWER = E_BLOCK_DANDELION, + E_BLOCK_RED_ROSE = E_BLOCK_FLOWER, + E_BLOCK_LOCKED_CHEST = E_BLOCK_STAINED_GLASS, }; // tolua_end |