Rename --do-unittests to --run-unittests as @Zeno- and @sfan5 requested

[minetest.git] / src / mapgen_v6.cpp

diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index 5c989a773a3999772ec8344eb3880627ded528e2..95cdbd279693363befca0cd4d2623e9d27117439 100644 (file)
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -438,7 +438,6 @@ void MapgenV6::makeChunk(BlockMakeData *data)
        this->ndef = data->nodedef;
 
        // Hack: use minimum block coords for old code that assumes a single block
-       v3s16 blockpos = data->blockpos_requested;
        v3s16 blockpos_min = data->blockpos_min;
        v3s16 blockpos_max = data->blockpos_max;
 
@@ -500,7 +499,7 @@ void MapgenV6::makeChunk(BlockMakeData *data)
        }
 
        // Add dungeons
-       if (flags & MG_DUNGEONS) {
+       if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
                DungeonParams dp;
 
                dp.np_rarity  = nparams_dungeon_rarity;
@@ -551,8 +550,7 @@ void MapgenV6::makeChunk(BlockMakeData *data)
 
        // Calculate lighting
        if (flags & MG_LIGHT)
-               calcLighting(node_min - v3s16(1, 1, 1) * MAP_BLOCKSIZE,
-                                        node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
+               calcLighting(node_min, node_max);
 
        this->generating = false;
 }