From: kwolekr <kwolekr@minetest.net>
Date: Mon, 25 Mar 2013 00:19:29 +0000 (-0400)
Subject: Ensure ore can fit in OreSheet::generate()
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=8d13967aa3a802df8fa8d97fcce32fea2b46f2bf;p=zefram%2Fminetest%2Fminetest_engine.git

Ensure ore can fit in OreSheet::generate()
---

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 53b5d686..689ad63c 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -141,8 +141,10 @@ void OreSheet::generate(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) {
 	PseudoRandom pr(blockseed + 4234);
 	
 	int ymin = MYMAX(nmin.Y, height_min);
-	int ymax = MYMIN(nmax.Y, height_max);	
-	
+	int ymax = MYMIN(nmax.Y, height_max);
+	if (clust_size >= ymax - ymin + 1)
+		return;
+		
 	int x0 = nmin.X;
 	int z0 = nmin.Z;
 	
@@ -150,7 +152,6 @@ void OreSheet::generate(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) {
 	int z1 = nmax.Z;
 	
 	int max_height = clust_size;
-	
 	int y_start = pr.range(ymin, ymax - max_height);
 	
 	if (!noise) {