From 65b2a2cb02098a6806540f5049398e3dbec4675d Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 26 Nov 2011 12:40:25 +0200
Subject: [PATCH] Make lighting update occur immediately after
 ClientActiveObject addition to make objects show up much more responsively

---
 src/environment.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/environment.cpp b/src/environment.cpp
index a01bf1037..c2bc2692e 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -2289,8 +2289,18 @@ u16 ClientEnvironment::addActiveObject(ClientActiveObject *object)
 	infostream<<"ClientEnvironment::addActiveObject(): "
 			<<"added (id="<<object->getId()<<")"<<std::endl;
 	m_active_objects.insert(object->getId(), object);
-	// TODO: Make g_texturesource non-global
 	object->addToScene(m_smgr, m_texturesource);
+	{ // Update lighting immediately
+		u8 light = 0;
+		try{
+			// Get node at head
+			v3s16 p = object->getLightPosition();
+			MapNode n = m_map->getNode(p);
+			light = n.getLightBlend(getDayNightRatio(), m_gamedef->ndef());
+		}
+		catch(InvalidPositionException &e) {}
+		object->updateLight(light);
+	}
 	return object->getId();
 }