From: paramat <paramat@users.noreply.github.com>
Date: Thu, 15 Mar 2018 04:29:09 +0000 (+0000)
Subject: Biomes: Fix vertical biome blend
X-Git-Tag: 5.0.0~517
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=19c993bc39ea18f0ab2422b3f362ef16ddab75c8;p=oweals%2Fminetest.git

Biomes: Fix vertical biome blend
---

diff --git a/src/mapgen/mg_biome.cpp b/src/mapgen/mg_biome.cpp
index 376f2d448..7f091f313 100644
--- a/src/mapgen/mg_biome.cpp
+++ b/src/mapgen/mg_biome.cpp
@@ -139,7 +139,7 @@ Biome *BiomeManager::getBiomeFromNoiseOriginal(float heat, float humidity, v3s16
 	}
 
 	mysrand(pos.Y + (heat + humidity) / 2);
-	if (biome_closest_blend &&
+	if (biome_closest_blend && dist_min_blend <= dist_min &&
 			myrand_range(0, biome_closest_blend->vertical_blend) >=
 			pos.Y - biome_closest_blend->max_pos.Y)
 		return biome_closest_blend;
@@ -300,7 +300,7 @@ Biome *BiomeGenOriginal::calcBiomeFromNoise(float heat, float humidity, v3s16 po
 	// blend.
 	mysrand(pos.Y + (heat + humidity) / 2);
 
-	if (biome_closest_blend &&
+	if (biome_closest_blend && dist_min_blend <= dist_min &&
 			myrand_range(0, biome_closest_blend->vertical_blend) >=
 			pos.Y - biome_closest_blend->max_pos.Y)
 		return biome_closest_blend;