3 files changed, 32 insertions, 26 deletions

diff --git a/src/BlockID.h b/src/BlockID.h
index 9787b3bfa..984c782c4 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -555,10 +555,10 @@ enum
 	E_META_PRESSURE_PLATE_RAISED = 0,
 	E_META_PRESSURE_PLATE_DEPRESSED = 1,
 	
-	// E_BLOCK_PRISMARINE:
-	E_META_PRISMRAINE_ROUGH  = 0,
-	E_META_PRISMARINE_BRICKS = 1,
-	E_META_PRISMARINE_DARK   = 2,
+	// E_BLOCK_PRISMARINE_BLOCK metas:
+	E_META_PRISMRAINE_BLOCK_ROUGH  = 0,
+	E_META_PRISMARINE_BLOCK_BRICKS = 1,
+	E_META_PRISMARINE_BLOCK_DARK   = 2,
 	
 	// E_BLOCK_QUARTZ_BLOCK metas:
 	E_META_QUARTZ_NORMAL = 0,
@@ -577,7 +577,7 @@ enum
 	E_META_RAIL_CURVED_ZM_XM       = 8,
 	E_META_RAIL_CURVED_ZM_XP       = 9,
 	
-	// E_BLOCK_RED_SANDSTONE:
+	// E_BLOCK_RED_SANDSTONE metas:
 	E_META_RED_SANDSTONE_NORMAL   = 0,
 	E_META_RED_SANDSTONE_ORNAMENT = 1,
 	E_META_RED_SANDSTONE_SMOOTH   = 2,
@@ -746,7 +746,7 @@ enum
 	////////////////////////////////////////////////////////////////////////////////
 	// Item metas:
 	
-	// E_ITEM_BANNER:
+	// E_ITEM_BANNER metas:
 	E_META_BANNER_BLACK      = 0,
 	E_META_BANNER_RED        = 1,
 	E_META_BANNER_GREEN      = 2,
@@ -790,7 +790,7 @@ enum
 	E_META_GOLDEN_APPLE_NORMAL = 0,
 	E_META_GOLDEN_APPLE_ENCHANTED = 1,
 	
-	// E_ITEM_HEAD:
+	// E_ITEM_HEAD metas:
 	E_META_HEAD_SKELETON = 0,
 	E_META_HEAD_WITHER   = 1,
 	E_META_HEAD_ZOMBIE   = 2,
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index caa623abc..912dde022 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -574,6 +574,7 @@ bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
 		case E_BLOCK_COBBLESTONE_WALL:
 		case E_BLOCK_DIAMOND_BLOCK:
 		case E_BLOCK_DIAMOND_ORE:
+		case E_BLOCK_DOUBLE_NEW_STONE_SLAB:
 		case E_BLOCK_DOUBLE_STONE_SLAB:
 		case E_BLOCK_EMERALD_ORE:
 		case E_BLOCK_ENCHANTMENT_TABLE:
@@ -587,6 +588,7 @@ bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
 		case E_BLOCK_LAPIS_BLOCK:
 		case E_BLOCK_LAPIS_ORE:
 		case E_BLOCK_LIT_FURNACE:
+		case E_BLOCK_MOB_SPAWNER:
 		case E_BLOCK_MOSSY_COBBLESTONE:
 		case E_BLOCK_NETHER_BRICK:
 		case E_BLOCK_NETHER_BRICK_STAIRS:
@@ -594,6 +596,7 @@ bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
 		case E_BLOCK_NETHERRACK:
 		case E_BLOCK_NEW_STONE_SLAB:
 		case E_BLOCK_OBSIDIAN:
+		case E_BLOCK_PACKED_ICE:
 		case E_BLOCK_PRISMARINE_BLOCK:
 		case E_BLOCK_RED_SANDSTONE:
 		case E_BLOCK_RED_SANDSTONE_STAIRS:
@@ -608,8 +611,6 @@ bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
 		case E_BLOCK_STONE_PRESSURE_PLATE:
 		case E_BLOCK_STONE_SLAB:
 		case E_BLOCK_VINES:
-		case E_BLOCK_PACKED_ICE:
-		case E_BLOCK_MOB_SPAWNER:
 		{
 			return false;
 		}
diff --git a/src/Items/ItemPickaxe.h b/src/Items/ItemPickaxe.h
index e0cf5d711..b5dc179f8 100644
--- a/src/Items/ItemPickaxe.h
+++ b/src/Items/ItemPickaxe.h
@@ -41,11 +41,11 @@ public:
 			
 			case E_BLOCK_DIAMOND_BLOCK:
 			case E_BLOCK_DIAMOND_ORE:
+			case E_BLOCK_EMERALD_ORE:
 			case E_BLOCK_GOLD_BLOCK:
 			case E_BLOCK_GOLD_ORE:
 			case E_BLOCK_REDSTONE_ORE:
 			case E_BLOCK_REDSTONE_ORE_GLOWING:
-			case E_BLOCK_EMERALD_ORE:
 			{
 				return PickaxeLevel() >= 3;
 			}
@@ -59,29 +59,34 @@ public:
 			}
 			
 			case E_BLOCK_ANVIL:
-			case E_BLOCK_ENCHANTMENT_TABLE:
-			case E_BLOCK_FURNACE:
-			case E_BLOCK_LIT_FURNACE:
+			case E_BLOCK_BRICK:
+			case E_BLOCK_CAULDRON:
 			case E_BLOCK_COAL_ORE:
-			case E_BLOCK_STONE:
 			case E_BLOCK_COBBLESTONE:
+			case E_BLOCK_COBBLESTONE_STAIRS:
+			case E_BLOCK_COBBLESTONE_WALL:
+			case E_BLOCK_DOUBLE_NEW_STONE_SLAB:
+			case E_BLOCK_DOUBLE_STONE_SLAB:
+			case E_BLOCK_ENCHANTMENT_TABLE:
 			case E_BLOCK_END_STONE:
+			case E_BLOCK_FURNACE:
+			case E_BLOCK_LIT_FURNACE:
+			case E_BLOCK_MOB_SPAWNER:
 			case E_BLOCK_MOSSY_COBBLESTONE:
-			case E_BLOCK_SANDSTONE_STAIRS:
-			case E_BLOCK_SANDSTONE:
-			case E_BLOCK_STONE_BRICKS:
 			case E_BLOCK_NETHER_BRICK:
+			case E_BLOCK_NETHER_BRICK_STAIRS:
 			case E_BLOCK_NETHERRACK:
-			case E_BLOCK_STONE_SLAB:
-			case E_BLOCK_DOUBLE_STONE_SLAB:
-			case E_BLOCK_STONE_PRESSURE_PLATE:
-			case E_BLOCK_BRICK:
-			case E_BLOCK_COBBLESTONE_STAIRS:
-			case E_BLOCK_COBBLESTONE_WALL:
+			case E_BLOCK_NEW_STONE_SLAB:
+			case E_BLOCK_PRISMARINE_BLOCK:
+			case E_BLOCK_RED_SANDSTONE:
+			case E_BLOCK_RED_SANDSTONE_STAIRS:
+			case E_BLOCK_SANDSTONE:
+			case E_BLOCK_SANDSTONE_STAIRS:
+			case E_BLOCK_STONE:
+			case E_BLOCK_STONE_BRICKS:
 			case E_BLOCK_STONE_BRICK_STAIRS:
-			case E_BLOCK_NETHER_BRICK_STAIRS:
-			case E_BLOCK_CAULDRON:
-			case E_BLOCK_MOB_SPAWNER:
+			case E_BLOCK_STONE_PRESSURE_PLATE:
+			case E_BLOCK_STONE_SLAB:
 			{
 				return PickaxeLevel() >= 1;
 			}