From: Paramat <paramat@users.noreply.github.com>
Date: Tue, 26 Jun 2018 18:35:23 +0000 (+0100)
Subject: Cavegen: Fix errors when getting biome outside mapchunk (#7480)
X-Git-Tag: 5.0.0~332
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=93661ca2122639b000dc3860700e5c61ebbc6497;p=oweals%2Fminetest.git

Cavegen: Fix errors when getting biome outside mapchunk (#7480)

Some cave segments are outside the mapchunk.

Previously, biome was being calculated by a function that uses the noise
maps. Points outside the mapchunk resulted in incorrect noise map indexes
that were sometimes outside the noise map size, causing a crash.

Use either noise maps or point noise calculations depending on point
location.
---

diff --git a/src/mapgen/cavegen.cpp b/src/mapgen/cavegen.cpp
index 363219f6d..e54d76e08 100644
--- a/src/mapgen/cavegen.cpp
+++ b/src/mapgen/cavegen.cpp
@@ -507,7 +507,16 @@ void CavesRandomWalk::carveRoute(v3f vec, float f, bool randomize_xz)
 	MapNode liquidnode = CONTENT_IGNORE;
 
 	if (bmgn) {
-		Biome *biome = (Biome *)bmgn->getBiomeAtPoint(cpabs);
+		Biome *biome = nullptr;
+		if (cpabs.X < node_min.X || cpabs.X > node_max.X ||
+				cpabs.Z < node_min.Z || cpabs.Z > node_max.Z)
+			// Point is outside heat and humidity noise maps so use point noise
+			// calculations.
+			biome = (Biome *)bmgn->calcBiomeAtPoint(cpabs);
+		else
+			// Point is inside heat and humidity noise maps so use them
+			biome = (Biome *)bmgn->getBiomeAtPoint(cpabs);
+
 		if (biome->c_cave_liquid != CONTENT_IGNORE)
 			liquidnode = biome->c_cave_liquid;
 	}