3 files changed, 50 insertions, 21 deletions

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/ItemHoe.h b/src/Items/ItemHoe.h
index de8b9a061..ae3723323 100644
--- a/src/Items/ItemHoe.h
+++ b/src/Items/ItemHoe.h
@@ -24,12 +24,35 @@ public:
 		{
 			return false;
 		}
-		BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
 		BLOCKTYPE UpperBlock = a_World->GetBlock(a_BlockX, a_BlockY + 1, a_BlockZ);
 
+		BLOCKTYPE Block;
+		NIBBLETYPE BlockMeta;
+		a_World->GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, Block, BlockMeta);
+
 		if (((Block == E_BLOCK_DIRT) || (Block == E_BLOCK_GRASS)) && (UpperBlock == E_BLOCK_AIR))
 		{
-			a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_FARMLAND, 0);
+			BLOCKTYPE NewBlock = E_BLOCK_FARMLAND;
+			if (Block == E_BLOCK_DIRT)
+			{
+				switch (BlockMeta)
+				{
+					case E_META_DIRT_COARSE:
+					{
+						// Transform to normal dirt
+						NewBlock = E_BLOCK_DIRT;
+						break;
+					}
+					case E_META_DIRT_PODZOL:
+					{
+						// You can't transform this block with a hoe in vanilla
+						return false;
+					}
+					default: break;
+				}
+			}
+
+			a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, NewBlock, 0);
 			a_World->BroadcastSoundEffect("dig.gravel", a_BlockX + 0.5, a_BlockY + 0.5, a_BlockZ + 0.5, 1.0f, 0.8f);
 			a_Player->UseEquippedItem();
 			return true;
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;
 			}