5 files changed, 28 insertions, 15 deletions
diff --git a/src/Generating/ChunkDesc.cpp b/src/Generating/ChunkDesc.cpp
index 7711723fc..e4b305022 100644
--- a/src/Generating/ChunkDesc.cpp
+++ b/src/Generating/ChunkDesc.cpp
@@ -290,7 +290,7 @@ void cChunkDesc::ReadBlockArea(cBlockArea & a_Dest, int a_MinRelX, int a_MaxRelX
 		LOGWARNING("%s: MaxRelX less than zero, adjusting to zero", __FUNCTION__);
 		a_MaxRelX = 0;
 	}
-	else if (a_MinRelX >= cChunkDef::Width)
+	else if (a_MaxRelX >= cChunkDef::Width)
 	{
 		LOGWARNING("%s: MaxRelX more than chunk width, adjusting to chunk width", __FUNCTION__);
 		a_MaxRelX = cChunkDef::Width - 1;
@@ -311,7 +311,7 @@ void cChunkDesc::ReadBlockArea(cBlockArea & a_Dest, int a_MinRelX, int a_MaxRelX
 		LOGWARNING("%s: MaxRelY less than zero, adjusting to zero", __FUNCTION__);
 		a_MaxRelY = 0;
 	}
-	else if (a_MinRelY >= cChunkDef::Height)
+	else if (a_MaxRelY >= cChunkDef::Height)
 	{
 		LOGWARNING("%s: MaxRelY more than chunk height, adjusting to chunk height", __FUNCTION__);
 		a_MaxRelY = cChunkDef::Height - 1;
@@ -332,7 +332,7 @@ void cChunkDesc::ReadBlockArea(cBlockArea & a_Dest, int a_MinRelX, int a_MaxRelX
 		LOGWARNING("%s: MaxRelZ less than zero, adjusting to zero", __FUNCTION__);
 		a_MaxRelZ = 0;
 	}
-	else if (a_MinRelZ >= cChunkDef::Width)
+	else if (a_MaxRelZ >= cChunkDef::Width)
 	{
 		LOGWARNING("%s: MaxRelZ more than chunk width, adjusting to chunk width", __FUNCTION__);
 		a_MaxRelZ = cChunkDef::Width - 1;
diff --git a/src/Generating/GridStructGen.cpp b/src/Generating/GridStructGen.cpp
index 95f8c38bc..fd1d5e49f 100644
--- a/src/Generating/GridStructGen.cpp
+++ b/src/Generating/GridStructGen.cpp
@@ -44,6 +44,7 @@ cGridStructGen::cGridStructGen(
 	int a_MaxStructureSizeX, int a_MaxStructureSizeZ,
 	size_t a_MaxCacheSize
 ) :
+	m_Seed(a_Seed),
 	m_Noise(a_Seed),
 	m_GridSizeX(a_GridSizeX),
 	m_GridSizeZ(a_GridSizeZ),
@@ -53,6 +54,16 @@ cGridStructGen::cGridStructGen(
 	m_MaxStructureSizeZ(a_MaxStructureSizeZ),
 	m_MaxCacheSize(a_MaxCacheSize)
 {
+	if (m_GridSizeX == 0)
+	{
+		LOG("Grid Size cannot be zero, setting to 1");
+		m_GridSizeX = 1;
+	}
+	if (m_GridSizeZ == 0)
+	{
+		LOG("Grid Size cannot be zero, setting to 1");
+		m_GridSizeZ = 1;
+	}
 	size_t NumStructuresPerQuery = (size_t)(((m_MaxStructureSizeX + m_MaxOffsetX) / m_GridSizeX + 1) * ((m_MaxStructureSizeZ + m_MaxOffsetZ) / m_GridSizeZ + 1));
 	if (NumStructuresPerQuery > m_MaxCacheSize)
 	{
diff --git a/src/Generating/Prefabs/AlchemistVillagePrefabs.cpp b/src/Generating/Prefabs/AlchemistVillagePrefabs.cpp
index 5cb864d53..976f8490e 100644
--- a/src/Generating/Prefabs/AlchemistVillagePrefabs.cpp
+++ b/src/Generating/Prefabs/AlchemistVillagePrefabs.cpp
@@ -58,9 +58,9 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
 		"o: 50: 4\n"  /* torch */
 		"p: 13: 0\n"  /* gravel */
 		"q:  5: 0\n"  /* wood */
-		"r: 96:12\n"  /* trapdoor */
+		"r: 96: 8\n"  /* trapdoor */
 		"s:128: 5\n"  /* sandstonestairs */
-		"t:107: 0\n"  /* fencegate */
+		"t:107: 2\n"  /* fencegate */
 		"u:128: 4\n"  /* sandstonestairs */
 		"v:134: 3\n"  /* 134 */
 		"w: 85: 0\n"  /* fence */
@@ -288,7 +288,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
 		"d: 13: 0\n"  /* gravel */
 		"e:  5: 0\n"  /* wood */
 		"f:128: 5\n"  /* sandstonestairs */
-		"g:107: 0\n"  /* fencegate */
+		"g:107: 2\n"  /* fencegate */
 		"h:128: 4\n"  /* sandstonestairs */
 		"i:134: 1\n"  /* 134 */
 		"j:134: 3\n"  /* 134 */
@@ -298,7 +298,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
 		"n:134: 5\n"  /* 134 */
 		"o:134: 7\n"  /* 134 */
 		"p:134: 4\n"  /* 134 */
-		"q:107: 5\n"  /* fencegate */
+		"q:107: 1\n"  /* fencegate */
 		"r: 64: 1\n"  /* wooddoorblock */
 		"s: 65: 3\n"  /* ladder */
 		"t: 50: 3\n"  /* torch */
@@ -2195,7 +2195,7 @@ const cPrefab::sDef g_AlchemistVillagePrefabs[] =
 		0,
 
 		// MoveToGround:
-		false,
+		true,
 	},  // LittleHouse8
 
 
diff --git a/src/Generating/Prefabs/JapaneseVillagePrefabs.cpp b/src/Generating/Prefabs/JapaneseVillagePrefabs.cpp
index 79f7a5272..d22153d87 100644
--- a/src/Generating/Prefabs/JapaneseVillagePrefabs.cpp
+++ b/src/Generating/Prefabs/JapaneseVillagePrefabs.cpp
@@ -294,7 +294,7 @@ const cPrefab::sDef g_JapaneseVillagePrefabs[] =
 		0,
 
 		// MoveToGround:
-		false,
+		true,
 	},  // Farm
 
 
diff --git a/src/Generating/Prefabs/PlainsVillagePrefabs.cpp b/src/Generating/Prefabs/PlainsVillagePrefabs.cpp
index 9e5e06769..bad8dae74 100644
--- a/src/Generating/Prefabs/PlainsVillagePrefabs.cpp
+++ b/src/Generating/Prefabs/PlainsVillagePrefabs.cpp
@@ -356,6 +356,8 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
 		"e:  8: 0\n"  /* water */
 		"f: 50: 5\n"  /* torch */
 		"g: 59: 7\n"  /* crops */
+		"h: 59: 0\n"  /* crops */
+		"i: 59: 1\n"  /* crops */
 		"m: 19: 0\n"  /* sponge */,
 
 		// Block data:
@@ -403,12 +405,12 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
 		/*    *   012345678901234 */
 		/*  0 */ "f.....f.f.....f"
 		/*  1 */ ".gg.gg...gg.gg."
-		/*  2 */ ".g...g...gg.gg."
-		/*  3 */ ".g.......gg.gg."
-		/*  4 */ ".gg..g...gg.gg."
-		/*  5 */ ".gg..g...gg.gg."
-		/*  6 */ "..g..g...gg.gg."
-		/*  7 */ "..g.g....gg.gg."
+		/*  2 */ ".gh.hg...gg.gg."
+		/*  3 */ ".gh.ih...gg.gg."
+		/*  4 */ ".gg.hg...gg.gg."
+		/*  5 */ ".gg.hg...gg.gg."
+		/*  6 */ ".ig.hg...gg.gg."
+		/*  7 */ ".hg.gh...gg.gg."
 		/*  8 */ "f.....f.f.....f"
 
 		// Level 4