From 0e1e76fa7717a73268cec2534a6dc5c5ff24dc11 Mon Sep 17 00:00:00 2001 From: Samuel Barney Date: Thu, 3 Oct 2013 21:35:17 -0600 Subject: Rain now waters farmland. --- source/Blocks/BlockFarmland.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source/Blocks') diff --git a/source/Blocks/BlockFarmland.h b/source/Blocks/BlockFarmland.h index 6cab1fa38..16d94d435 100644 --- a/source/Blocks/BlockFarmland.h +++ b/source/Blocks/BlockFarmland.h @@ -42,6 +42,9 @@ public: return; } bool Found = false; + + if (a_World->GetWeather() != eWeather_Rain || a_World->GetBiomeAt(a_BlockX, a_BlockZ) == 1) + { int NumBlocks = Area.GetBlockCount(); BLOCKTYPE * BlockTypes = Area.GetBlockTypes(); for (int i = 0; i < NumBlocks; i++) @@ -55,6 +58,11 @@ public: break; } } + } + else + { + Found = true; + } NIBBLETYPE BlockMeta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); -- cgit v1.2.3 From d1448d12a052b1ab9edf22447cff621c7e171593 Mon Sep 17 00:00:00 2001 From: Samuel Barney Date: Thu, 3 Oct 2013 21:39:07 -0600 Subject: Added comparison for desert biomes. --- source/Blocks/BlockFarmland.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/Blocks') diff --git a/source/Blocks/BlockFarmland.h b/source/Blocks/BlockFarmland.h index 16d94d435..5aef10556 100644 --- a/source/Blocks/BlockFarmland.h +++ b/source/Blocks/BlockFarmland.h @@ -43,7 +43,8 @@ public: } bool Found = false; - if (a_World->GetWeather() != eWeather_Rain || a_World->GetBiomeAt(a_BlockX, a_BlockZ) == 1) + 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(); -- cgit v1.2.3