From 8d13967aa3a802df8fa8d97fcce32fea2b46f2bf Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sun, 24 Mar 2013 20:19:29 -0400 Subject: [PATCH] Ensure ore can fit in OreSheet::generate() --- src/mapgen.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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) {