X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmapgen_v6.cpp;h=64f3b9ed9527a4f848114557f79bb13de10c6b6a;hb=b38afc9311e235d2b90d61dbbcf1a18e549073a7;hp=d3db00dc20b0d93807a2376704cc69e118edf1f6;hpb=f18b4872ea7e46b50c9ea0e5e6484baae41b0a44;p=dragonfireclient.git

diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index d3db00dc2..64f3b9ed9 100644
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -149,8 +149,8 @@ bool MapgenV6::block_is_underground(u64 seed, v3s16 blockpos)
 
 float MapgenV6::baseTerrainLevel(float terrain_base, float terrain_higher,
 									float steepness, float height_select) {	
-	float base   = water_level + terrain_base;
-	float higher = water_level + terrain_higher;
+	float base   = 1 + terrain_base;
+	float higher = 1 + terrain_higher;
 
 	// Limit higher ground level to at least base
 	if(higher < base)
@@ -459,8 +459,9 @@ void MapgenV6::makeChunk(BlockMakeData *data) {
 	}
 
 	// Calculate lighting
-	calcLighting(node_min - v3s16(1, 1, 1) * MAP_BLOCKSIZE,
-				 node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
+	if (!(flags & MG_NOLIGHT))
+		calcLighting(node_min - v3s16(1, 1, 1) * MAP_BLOCKSIZE,
+					 node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
 	
 	this->generating = false;
 }