summaryrefslogtreecommitdiffstats
path: root/source/cBlockToPickup.cpp
diff options
context:
space:
mode:
authoradmin@omencraft.com <admin@omencraft.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2011-11-07 19:19:38 +0100
committeradmin@omencraft.com <admin@omencraft.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2011-11-07 19:19:38 +0100
commit907ba15fe208f6a8ad37f35652ae3ceac6bb39e9 (patch)
tree545147a563083cedd2c8a029bdb2ba579cc8ec8e /source/cBlockToPickup.cpp
parentPistons now generate noise and animate when moving. (diff)
downloadcuberite-907ba15fe208f6a8ad37f35652ae3ceac6bb39e9.tar
cuberite-907ba15fe208f6a8ad37f35652ae3ceac6bb39e9.tar.gz
cuberite-907ba15fe208f6a8ad37f35652ae3ceac6bb39e9.tar.bz2
cuberite-907ba15fe208f6a8ad37f35652ae3ceac6bb39e9.tar.lz
cuberite-907ba15fe208f6a8ad37f35652ae3ceac6bb39e9.tar.xz
cuberite-907ba15fe208f6a8ad37f35652ae3ceac6bb39e9.tar.zst
cuberite-907ba15fe208f6a8ad37f35652ae3ceac6bb39e9.zip
Diffstat (limited to '')
-rw-r--r--source/cBlockToPickup.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/source/cBlockToPickup.cpp b/source/cBlockToPickup.cpp
index 3638740a3..75ba77f9a 100644
--- a/source/cBlockToPickup.cpp
+++ b/source/cBlockToPickup.cpp
@@ -13,12 +13,24 @@ ENUM_ITEM_ID cBlockToPickup::ToPickup( unsigned char a_BlockID, ENUM_ITEM_ID a_U
return E_ITEM_COBBLESTONE;
case E_BLOCK_GRASS:
return E_ITEM_DIRT;
+ case E_BLOCK_GLASS:
+ return E_ITEM_EMPTY;
case E_BLOCK_DIRT:
return E_ITEM_DIRT;
case E_BLOCK_LOG:
return E_ITEM_LOG;
+ case E_BLOCK_LEAVES:
+ if( a_UsedItemID == E_ITEM_SHEARS )
+ return E_ITEM_LEAVES;
+ else
+ return E_ITEM_EMPTY;
case E_BLOCK_COAL_ORE:
return E_ITEM_COAL;
+ case E_BLOCK_LAPIS_ORE:
+ return E_ITEM_DYE;
+ case E_BLOCK_REDSTONE_ORE_GLOWING:
+ case E_BLOCK_REDSTONE_ORE:
+ return E_ITEM_REDSTONE_DUST;
case E_BLOCK_DIAMOND_ORE:
return E_ITEM_DIAMOND;
case E_BLOCK_IRON_BLOCK:
@@ -30,6 +42,12 @@ ENUM_ITEM_ID cBlockToPickup::ToPickup( unsigned char a_BlockID, ENUM_ITEM_ID a_U
case E_BLOCK_SIGN_POST:
case E_BLOCK_WALLSIGN:
return E_ITEM_SIGN;
+ case E_BLOCK_REDSTONE_WIRE:
+ return E_ITEM_REDSTONE_DUST;
+ case E_BLOCK_REDSTONE_TORCH_OFF:
+ return E_ITEM_REDSTONE_TORCH_ON;
+ case E_BLOCK_MELON:
+ return E_ITEM_MELON_SLICE;
default:
return (ENUM_ITEM_ID)a_BlockID;
}