2 files changed, 72 insertions, 1 deletions

diff --git a/src/Blocks/BlockDirt.h b/src/Blocks/BlockDirt.h
index aae6719e2..12bca92dd 100644
--- a/src/Blocks/BlockDirt.h
+++ b/src/Blocks/BlockDirt.h
@@ -52,7 +52,19 @@ public:
 				return;
 			}
 		}
-		
+
+		// Make sure that there is enough light at the source block to spread
+		if (!a_Chunk.GetWorld()->IsChunkLighted(a_Chunk.GetPosX(), a_Chunk.GetPosZ()))
+		{
+			a_Chunk.GetWorld()->QueueLightChunk(a_Chunk.GetPosX(), a_Chunk.GetPosZ());
+			return;
+		}
+		else if (std::max(a_Chunk.GetBlockLight(a_RelX, a_RelY + 1, a_RelZ), a_Chunk.GetTimeAlteredLight(a_Chunk.GetSkyLight(a_RelX, a_RelY + 1, a_RelZ))) < 9)
+		{
+			// Source block is not bright enough to spread
+			return;
+		}
+
 		// Grass spreads to adjacent dirt blocks:
 		cFastRandom rand;
 		for (int i = 0; i < 2; i++)  // Pick two blocks to grow to
diff --git a/src/Blocks/BlockOre.h b/src/Blocks/BlockOre.h
index f6ea3aa3c..08d79f435 100644
--- a/src/Blocks/BlockOre.h
+++ b/src/Blocks/BlockOre.h
@@ -11,6 +11,7 @@
 class cBlockOreHandler :
 	public cBlockHandler
 {
+	typedef cBlockHandler super;
 public:
 	cBlockOreHandler(BLOCKTYPE a_BlockType)
 		: cBlockHandler(a_BlockType)
@@ -56,6 +57,64 @@ public:
 			}
 		}
 	}
+
+	virtual void OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override
+	{
+		super::OnDestroyedByPlayer(a_ChunkInterface, a_WorldInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ);
+
+		if (a_Player->IsGameModeCreative())
+		{
+			// Don't drop XP when the player is in creative mode.
+			return;
+		}
+
+		if (a_Player->GetEquippedItem().m_Enchantments.GetLevel(cEnchantments::enchSilkTouch) != 0)
+		{
+			// Don't drop XP when the ore is mined with the Silk Touch enchantment
+			return;
+		}
+
+		cFastRandom Random;
+		int Reward = 0;
+
+		switch (m_BlockType)
+		{
+			case E_BLOCK_NETHER_QUARTZ_ORE:
+			case E_BLOCK_LAPIS_ORE:
+			{
+				// Lapis and nether quartz get 2 - 5 experience
+				Reward = Random.NextInt(4) + 2;
+				break;
+			}
+			case E_BLOCK_REDSTONE_ORE:
+			case E_BLOCK_REDSTONE_ORE_GLOWING:
+			{
+				// Redstone gets 1 - 5 experience
+				Reward = Random.NextInt(5) + 1;
+				break;
+			}
+			case E_BLOCK_DIAMOND_ORE:
+			case E_BLOCK_EMERALD_ORE:
+			{
+				// Diamond and emerald get 3 - 7 experience
+				Reward = Random.NextInt(5) + 3;
+				break;
+			}
+			case E_BLOCK_COAL_ORE:
+			{
+				// Coal gets 0 - 2 experience
+				Reward = Random.NextInt(3);
+				break;
+			}
+
+			default: break;
+		}
+
+		if (Reward != 0)
+		{
+			a_WorldInterface.SpawnExperienceOrb(a_BlockX, a_BlockY, a_BlockZ, Reward);
+		}
+	}
 } ;