3 files changed, 8 insertions, 5 deletions
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index 67c945ce4..6ffcc718d 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -582,6 +582,7 @@ bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
 		case E_BLOCK_SNOW:
 		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 987357739..de8b9a061 100644
--- a/src/Items/ItemHoe.h
+++ b/src/Items/ItemHoe.h
@@ -18,17 +18,19 @@ public:
 	{
 	}
 
-	virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
+	virtual bool OnItemUse(cWorld *a_World, cPlayer *a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
 	{
-		if (a_Dir == BLOCK_FACE_NONE)
+		if ((a_Dir == BLOCK_FACE_NONE) || (a_BlockY >= cChunkDef::Height))
 		{
 			return false;
 		}
-
 		BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
-		if (IsBlockTypeOfDirt(Block))
+		BLOCKTYPE UpperBlock = a_World->GetBlock(a_BlockX, a_BlockY + 1, a_BlockZ);
+
+		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);
+			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;
 		}
@@ -45,4 +47,3 @@ public:
 
 
 
-
diff --git a/src/Items/ItemPickaxe.h b/src/Items/ItemPickaxe.h
index 17fd96822..e0cf5d711 100644
--- a/src/Items/ItemPickaxe.h
+++ b/src/Items/ItemPickaxe.h
@@ -81,6 +81,7 @@ public:
 			case E_BLOCK_STONE_BRICK_STAIRS:
 			case E_BLOCK_NETHER_BRICK_STAIRS:
 			case E_BLOCK_CAULDRON:
+			case E_BLOCK_MOB_SPAWNER:
 			{
 				return PickaxeLevel() >= 1;
 			}