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

Add additional blocks which are not breakable by hand

Browse Source
This commit is contained in:
Alexander Harkness 2020-04-07 22:59:29 +01:00
parent 4a62e004c5
commit b8141f6c87
2 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Items/ItemHandler.cpp
View File

@ -715,18 +715,29 @@ bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
switch (a_BlockType)
{
case E_BLOCK_ANVIL:
case E_BLOCK_BLACK_GLAZED_TERRACOTTA:
case E_BLOCK_BLOCK_OF_COAL:
case E_BLOCK_BLOCK_OF_REDSTONE:
case E_BLOCK_BLUE_GLAZED_TERRACOTTA:
case E_BLOCK_BONE_BLOCK:
case E_BLOCK_BREWING_STAND:
case E_BLOCK_BRICK:
case E_BLOCK_BRICK_STAIRS:
case E_BLOCK_BROWN_GLAZED_TERRACOTTA:
case E_BLOCK_CAULDRON:
case E_BLOCK_COAL_ORE:
case E_BLOCK_COBBLESTONE:
case E_BLOCK_COBBLESTONE_STAIRS:
case E_BLOCK_COBBLESTONE_WALL:
case E_BLOCK_COBWEB:
case E_BLOCK_CONCRETE:
case E_BLOCK_CYAN_GLAZED_TERRACOTTA:
case E_BLOCK_DIAMOND_BLOCK:
case E_BLOCK_DIAMOND_ORE:
case E_BLOCK_DISPENSER:
case E_BLOCK_DOUBLE_RED_SANDSTONE_SLAB:
case E_BLOCK_DOUBLE_STONE_SLAB:
case E_BLOCK_DROPPER:
case E_BLOCK_EMERALD_ORE:
case E_BLOCK_ENCHANTMENT_TABLE:
case E_BLOCK_END_BRICKS:
@ -734,35 +745,54 @@ bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
case E_BLOCK_FURNACE:
case E_BLOCK_GOLD_BLOCK:
case E_BLOCK_GOLD_ORE:
case E_BLOCK_GRAY_GLAZED_TERRACOTTA:
case E_BLOCK_GREEN_GLAZED_TERRACOTTA:
case E_BLOCK_HARDENED_CLAY:
case E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE:
case E_BLOCK_HOPPER:
case E_BLOCK_IRON_BARS:
case E_BLOCK_IRON_BLOCK:
case E_BLOCK_IRON_DOOR:
case E_BLOCK_IRON_ORE:
case E_BLOCK_IRON_TRAPDOOR:
case E_BLOCK_LAPIS_BLOCK:
case E_BLOCK_LAPIS_ORE:
case E_BLOCK_LIGHT_BLUE_GLAZED_TERRACOTTA:
case E_BLOCK_LIGHT_GRAY_GLAZED_TERRACOTTA:
case E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE:
case E_BLOCK_LIME_GLAZED_TERRACOTTA:
case E_BLOCK_LIT_FURNACE:
case E_BLOCK_MAGENTA_GLAZED_TERRACOTTA:
case E_BLOCK_MAGMA:
case E_BLOCK_MOB_SPAWNER:
case E_BLOCK_MOSSY_COBBLESTONE:
case E_BLOCK_NETHER_BRICK:
case E_BLOCK_NETHER_BRICK_STAIRS:
case E_BLOCK_NETHER_BRICK_FENCE:
case E_BLOCK_NETHERRACK:
case E_BLOCK_RED_SANDSTONE_SLAB:
case E_BLOCK_NETHER_BRICK:
case E_BLOCK_NETHER_BRICK_FENCE:
case E_BLOCK_NETHER_BRICK_STAIRS:
case E_BLOCK_NETHER_QUARTZ_ORE:
case E_BLOCK_OBSERVER:
case E_BLOCK_OBSIDIAN:
case E_BLOCK_ORANGE_GLAZED_TERRACOTTA:
case E_BLOCK_PINK_GLAZED_TERRACOTTA:
case E_BLOCK_PRISMARINE_BLOCK:
case E_BLOCK_PURPLE_GLAZED_TERRACOTTA:
case E_BLOCK_PURPUR_BLOCK:
case E_BLOCK_PURPUR_DOUBLE_SLAB:
case E_BLOCK_PURPUR_PILLAR:
case E_BLOCK_PURPUR_SLAB:
case E_BLOCK_PURPUR_STAIRS:
case E_BLOCK_RED_NETHER_BRICK:
case E_BLOCK_RED_SANDSTONE:
case E_BLOCK_RED_SANDSTONE_STAIRS:
case E_BLOCK_QUARTZ_BLOCK:
case E_BLOCK_QUARTZ_STAIRS:
case E_BLOCK_REDSTONE_ORE:
case E_BLOCK_REDSTONE_ORE_GLOWING:
case E_BLOCK_SANDSTONE_STAIRS:
case E_BLOCK_RED_GLAZED_TERRACOTTA:
case E_BLOCK_RED_NETHER_BRICK:
case E_BLOCK_RED_SANDSTONE:
case E_BLOCK_RED_SANDSTONE_SLAB:
case E_BLOCK_RED_SANDSTONE_STAIRS:
case E_BLOCK_SANDSTONE:
case E_BLOCK_SANDSTONE_STAIRS:
case E_BLOCK_SNOW:
case E_BLOCK_STONE:
case E_BLOCK_STONE_BRICKS:
@ -770,6 +800,8 @@ bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
case E_BLOCK_STONE_PRESSURE_PLATE:
case E_BLOCK_STONE_SLAB:
case E_BLOCK_VINES:
case E_BLOCK_WHITE_GLAZED_TERRACOTTA:
case E_BLOCK_YELLOW_GLAZED_TERRACOTTA:
{
return false;
}

1
src/Items/ItemPickaxe.h
View File

@ -47,6 +47,7 @@ public:
virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) override
{
// NOTICE: Make sure to update cItemHandler::CanHarvestBlock() if adding new blocks here!
switch (a_BlockType)
{
case E_BLOCK_OBSIDIAN: