From: kwolekr <kwolekr@minetest.net>
Date: Wed, 30 Mar 2016 03:59:39 +0000 (-0400)
Subject: Mapgen: Don't spread light of nodes outside the desired area
X-Git-Tag: 0.4.14~125
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0115da1d6348a08388238d8728daaa048a603522;p=oweals%2Fminetest.git

Mapgen: Don't spread light of nodes outside the desired area

This fixes #3935, a regression from 0338c2e.
An 'optimization' was performed where an index for the VoxelManip being
operated on was mistakenly used for bounds checking within the incorrect
VoxelArea, namely, the area wherein light should be spread.
---

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 29af83517..b3c9380a0 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -242,13 +242,10 @@ void Mapgen::setLighting(u8 light, v3s16 nmin, v3s16 nmax)
 
 void Mapgen::lightSpread(VoxelArea &a, v3s16 p, u8 light)
 {
-	if (light <= 1)
+	if (light <= 1 || !a.contains(p))
 		return;
 
 	u32 vi = vm->m_area.index(p);
-	if (!a.contains(vi))
-		return;
-
 	MapNode &n = vm->m_data[vi];
 
 	// Decay light in each of the banks separately