From: SmallJoker <SmallJoker@users.noreply.github.com>
Date: Sat, 19 Aug 2017 09:30:09 +0000 (+0200)
Subject: GenericCAO: Fix light position for non-players, remove deprecated initialisation... 
X-Git-Tag: 5.0.0~922
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4a1265ceb5919c53efaa8c50bbb0fe7955aa47aa;p=oweals%2Fminetest.git

GenericCAO: Fix light position for non-players, remove deprecated initialisation code (#6281)
---

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 627da056a..8f6847bc0 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -320,13 +320,6 @@ void GenericCAO::processInitData(const std::string &data)
 		m_yaw = readF1000(is);
 		m_hp = readS16(is);
 		num_messages = readU8(is);
-	} else if (version == 0) { // In PROTOCOL_VERSION 13
-		m_name = deSerializeString(is);
-		m_is_player = readU8(is);
-		m_position = readV3F1000(is);
-		m_yaw = readF1000(is);
-		m_hp = readS16(is);
-		num_messages = readU8(is);
 	} else {
 		errorstream<<"GenericCAO: Unsupported init data version"
 				<<std::endl;
@@ -689,7 +682,10 @@ void GenericCAO::updateLightNoCheck(u8 light_at_pos)
 
 v3s16 GenericCAO::getLightPosition()
 {
-	return floatToInt(m_position + v3f(0, 0.5 * BS, 0), BS);
+	if (m_is_player)
+		return floatToInt(m_position + v3f(0, 0.5 * BS, 0), BS);
+
+	return floatToInt(m_position, BS);
 }
 
 void GenericCAO::updateNodePos()