1 files changed, 9 insertions, 0 deletions

diff --git a/source/Blocks/BlockFarmland.h b/source/Blocks/BlockFarmland.h
index 6cab1fa38..5aef10556 100644
--- a/source/Blocks/BlockFarmland.h
+++ b/source/Blocks/BlockFarmland.h
@@ -42,6 +42,10 @@ public:
 			return;
 		}
 		bool Found = false;
+
+		int Biome = a_World->GetBiomeAt(a_BlockX, a_BlockZ);
+		if (a_World->GetWeather() != eWeather_Rain || Biome == biDesert || Biome == biDesertHills)
+		{
 		int NumBlocks = Area.GetBlockCount();
 		BLOCKTYPE * BlockTypes = Area.GetBlockTypes();
 		for (int i = 0; i < NumBlocks; i++)
@@ -55,6 +59,11 @@ public:
 				break;
 			}
 		}
+		}
+		else
+		{
+			Found = true;
+		}
 		
 		NIBBLETYPE BlockMeta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);