From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 26 Nov 2012 07:10:27 +0000 (+0200)
Subject: Fix LuaEntitySAO::getClientInitializationData() and bump the related version
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=ab507f83e2e0b1f442341724bc47a8480667628e;p=zefram%2Fminetest%2Fminetest_engine.git

Fix LuaEntitySAO::getClientInitializationData() and bump the related version
---

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 339c9f24..ce41c831 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -650,7 +650,7 @@ public:
 		// version
 		u8 version = readU8(is);
 		// check version
-		if(version != 0){
+		if(version != 1){
 			errorstream<<"GenericCAO: Unsupported init data version"
 					<<std::endl;
 			return;
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 406bd9c6..efc14570 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -567,10 +567,10 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 std::string LuaEntitySAO::getClientInitializationData()
 {
 	std::ostringstream os(std::ios::binary);
-	writeU8(os, 0); // version
+	writeU8(os, 1); // version
 	os<<serializeString(""); // name
-	writeS16(os, getId()); //id
 	writeU8(os, 0); // is_player
+	writeS16(os, getId()); //id
 	writeV3F1000(os, m_base_position);
 	writeF1000(os, m_yaw);
 	writeS16(os, m_hp);
@@ -965,7 +965,7 @@ bool PlayerSAO::unlimitedTransferDistance() const
 std::string PlayerSAO::getClientInitializationData()
 {
 	std::ostringstream os(std::ios::binary);
-	writeU8(os, 0); // version
+	writeU8(os, 1); // version
 	os<<serializeString(m_player->getName()); // name
 	writeU8(os, 1); // is_player
 	writeS16(os, getId()); //id