flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

* Block Info: glazed terracotta and concrete hardness/solid voxel status (#4205)

Browse Source
This commit is contained in:
Zach DeCook 2018-04-02 13:45:01 -04:00 committed by Alexander Harkness
parent dac6736eff
commit 7833e8112f
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/BlockInfo.cpp
View File

@ -549,6 +549,8 @@ cBlockInfo::cBlockInfoArray::cBlockInfoArray()
Info[E_BLOCK_COAL_ORE ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_COBBLESTONE ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_COMMAND_BLOCK ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_CONCRETE ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_CONCRETE_POWDER ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_CRAFTING_TABLE ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_DIAMOND_BLOCK ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_DIAMOND_ORE ].m_FullyOccupiesVoxel = true;
@ -567,6 +569,21 @@ cBlockInfo::cBlockInfoArray::cBlockInfoArray()
Info[E_BLOCK_GLOWSTONE ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_GOLD_BLOCK ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_GOLD_ORE ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_WHITE_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_ORANGE_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_MAGENTA_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_LIGHT_BLUE_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_YELLOW_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_LIME_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_PINK_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_GRAY_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_LIGHT_GRAY_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_CYAN_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_PURPLE_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_BLUE_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_BROWN_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_GREEN_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_BLACK_GLAZED_TERRACOTTA ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_GRASS ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_GRAVEL ].m_FullyOccupiesVoxel = true;
Info[E_BLOCK_HARDENED_CLAY ].m_FullyOccupiesVoxel = true;
@ -901,6 +918,24 @@ cBlockInfo::cBlockInfoArray::cBlockInfoArray()
Info[E_BLOCK_GREEN_SHULKER_BOX ].m_Hardness = 0.2f;
Info[E_BLOCK_RED_SHULKER_BOX ].m_Hardness = 0.2f;
Info[E_BLOCK_BLACK_SHULKER_BOX ].m_Hardness = 0.2f;
Info[E_BLOCK_WHITE_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_ORANGE_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_MAGENTA_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_LIGHT_BLUE_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_YELLOW_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_LIME_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_PINK_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_GRAY_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_LIGHT_GRAY_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_CYAN_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_PURPLE_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_BLUE_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_BROWN_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_GREEN_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_RED_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_BLACK_GLAZED_TERRACOTTA ].m_Hardness = 1.4f;
Info[E_BLOCK_CONCRETE ].m_Hardness = 1.8f;
Info[E_BLOCK_CONCRETE_POWDER ].m_Hardness = 0.5f;
Info[E_BLOCK_STRUCTURE_BLOCK ].m_Hardness = -1.0f;
for (size_t i = 0; i < Info.size(); ++i)