4 files changed, 19 insertions, 7 deletions
diff --git a/src/Generating/Prefab.cpp b/src/Generating/Prefab.cpp
index 2ab1455b9..7d876909a 100644
--- a/src/Generating/Prefab.cpp
+++ b/src/Generating/Prefab.cpp
@@ -211,6 +211,17 @@ void cPrefab::Draw(cChunkDesc & a_Dest, const Vector3i & a_Placement, int a_NumR
 	int ChunkStartZ = a_Dest.GetChunkZ() * cChunkDef::Width;
 	Placement.Move(-ChunkStartX, 0, -ChunkStartZ);
 	const cBlockArea & Image = m_BlockArea[a_NumRotations];
+	
+	// If the placement is outside this chunk, bail out:
+	if (
+		(Placement.x > cChunkDef::Width) || (Placement.x + Image.GetSizeX() < 0) ||
+		(Placement.z > cChunkDef::Width) || (Placement.z + Image.GetSizeZ() < 0)
+	)
+	{
+		return;
+	}
+	
+	// Write the image:
 	a_Dest.WriteBlockArea(Image, Placement.x, Placement.y, Placement.z, m_MergeStrategy);
 	
 	// If requested, draw the floor (from the bottom of the prefab down to the nearest non-air)
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..bba493bf1 100644
--- a/src/Generating/Prefabs/PlainsVillagePrefabs.cpp
+++ b/src/Generating/Prefabs/PlainsVillagePrefabs.cpp
@@ -356,6 +356,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
 		"e:  8: 0\n"  /* water */
 		"f: 50: 5\n"  /* torch */
 		"g: 59: 7\n"  /* crops */
+		"h:111: 0\n"  /* lilypad */
 		"m: 19: 0\n"  /* sponge */,
 
 		// Block data:
@@ -407,7 +408,7 @@ const cPrefab::sDef g_PlainsVillagePrefabs[] =
 		/*  3 */ ".g.......gg.gg."
 		/*  4 */ ".gg..g...gg.gg."
 		/*  5 */ ".gg..g...gg.gg."
-		/*  6 */ "..g..g...gg.gg."
+		/*  6 */ "..g..g...gghgg."
 		/*  7 */ "..g.g....gg.gg."
 		/*  8 */ "f.....f.f.....f"