4 files changed, 35 insertions, 21 deletions
diff --git a/source/Blocks/BlockCrops.h b/source/Blocks/BlockCrops.h
index 9e19b14ec..e7b320eac 100644
--- a/source/Blocks/BlockCrops.h
+++ b/source/Blocks/BlockCrops.h
@@ -78,10 +78,16 @@ public:
 	void OnUpdate(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
 		NIBBLETYPE Meta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
-		if (Meta < 7)
+		NIBBLETYPE Light = a_World->GetBlockBlockLight(a_BlockX, a_BlockY, a_BlockZ);
+		
+		if ((Meta < 7) && (Light > 8))
 		{
 			a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_CROPS, ++Meta);
 		}
+		else if (Light < 9)
+		{
+			a_World->DigBlock(a_BlockX, a_BlockY, a_BlockZ);
+		}
 	}
 
 
diff --git a/source/Blocks/BlockFarmland.h b/source/Blocks/BlockFarmland.h
index 6cab1fa38..7bc71f7f3 100644
--- a/source/Blocks/BlockFarmland.h
+++ b/source/Blocks/BlockFarmland.h
@@ -30,30 +30,38 @@ public:
 
 	virtual void OnUpdate(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
-		// TODO: Rain hydrates farmland, too. Check world weather, don't search for water if raining.
-		// NOTE: The desert biomes do not get precipitation, so another check needs to be made.
+		bool Found = false;
 		
-		// Search for water in a close proximity:
-		// Ref.: http://www.minecraftwiki.net/wiki/Farmland#Hydrated_Farmland_Tiles
-		cBlockArea Area;
-		if (!Area.Read(a_World, a_BlockX - 4, a_BlockX + 4, a_BlockY, a_BlockY + 1, a_BlockZ - 4, a_BlockZ + 4))
+		int Biome = a_World->GetBiomeAt(a_BlockX, a_BlockZ);
+		if (a_World->IsWeatherWet() && (Biome != biDesert) && (Biome != biDesertHills))
 		{
-			// Too close to the world edge, cannot check surroudnings; don't tick at all
-			return;
+			// Rain hydrates farmland, too, except in Desert biomes.
+			Found = true;
 		}
-		bool Found = false;
-		int NumBlocks = Area.GetBlockCount();
-		BLOCKTYPE * BlockTypes = Area.GetBlockTypes();
-		for (int i = 0; i < NumBlocks; i++)
+		else
 		{
-			if (
-				(BlockTypes[i] == E_BLOCK_WATER) ||
-				(BlockTypes[i] == E_BLOCK_STATIONARY_WATER)
-			)
+			// Search for water in a close proximity:
+			// Ref.: http://www.minecraftwiki.net/wiki/Farmland#Hydrated_Farmland_Tiles
+			cBlockArea Area;
+			if (!Area.Read(a_World, a_BlockX - 4, a_BlockX + 4, a_BlockY, a_BlockY + 1, a_BlockZ - 4, a_BlockZ + 4))
 			{
-				Found = true;
-				break;
+				// Too close to the world edge, cannot check surroudnings; don't tick at all
+				return;
 			}
+
+			int NumBlocks = Area.GetBlockCount();
+			BLOCKTYPE * BlockTypes = Area.GetBlockTypes();
+			for (int i = 0; i < NumBlocks; i++)
+			{
+				if (
+					(BlockTypes[i] == E_BLOCK_WATER) ||
+					(BlockTypes[i] == E_BLOCK_STATIONARY_WATER)
+				)
+				{
+					Found = true;
+					break;
+				}
+			}  // for i - BlockTypes[]
 		}
 		
 		NIBBLETYPE BlockMeta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
diff --git a/source/Blocks/BlockPlanks.h b/source/Blocks/BlockPlanks.h
index b30164741..f3b8dbfb6 100644
--- a/source/Blocks/BlockPlanks.h
+++ b/source/Blocks/BlockPlanks.h
@@ -24,7 +24,7 @@ public:
 	) override
 	{
 		a_BlockType = m_BlockType;
-		NIBBLETYPE Meta = a_Player->GetEquippedItem().m_ItemDamage;
+		NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage);
 		a_BlockMeta = Meta;
 		return true;
 	}
diff --git a/source/Blocks/BlockWood.h b/source/Blocks/BlockWood.h
index dd4544586..cb5ee995a 100644
--- a/source/Blocks/BlockWood.h
+++ b/source/Blocks/BlockWood.h
@@ -24,7 +24,7 @@ public:
 	) override
 	{
 		a_BlockType = m_BlockType;
-		NIBBLETYPE Meta = a_Player->GetEquippedItem().m_ItemDamage;
+		NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage);
 		a_BlockMeta = BlockFaceToMetaData(a_BlockFace, Meta);
 		return true;
 	}