From 5ac900ddd9d574440b499b15516747a374fe3a5a Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 18 Jun 2011 15:16:35 +0300
Subject: [PATCH] Changed MapBlockObjects to be never written anymore.
 Incremented version number.

---
 CMakeLists.txt   | 2 +-
 src/map.cpp      | 5 +++--
 src/mapblock.cpp | 4 +++-
 src/mapblock.h   | 4 ++--
 src/server.cpp   | 4 +++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c62d18e6..70d20dea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project(minetest)
 
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 20110602_1_dev)
+set(VERSION_PATCH 20110618_0_dev)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # Configuration options
diff --git a/src/map.cpp b/src/map.cpp
index 5cea4ebc..adcdaffe 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -5545,8 +5545,9 @@ void ServerMap::loadBlock(std::string sectordir, std::string blockfile, MapSecto
 	catch(SerializationError &e)
 	{
 		dstream<<"WARNING: Invalid block data on disk "
-				"(SerializationError). "
-				"what()="<<e.what()
+				<<"fullpath="<<fullpath
+				<<" (SerializationError). "
+				<<"what()="<<e.what()
 				<<std::endl;
 				//" Ignoring. A new one will be generated.
 		assert(0);
diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index db7894a7..2dfb07f9 100644
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -830,7 +830,9 @@ void MapBlock::serializeDiskExtra(std::ostream &os, u8 version)
 	// Versions up from 9 have block objects.
 	if(version >= 9)
 	{
-		serializeObjects(os, version);
+		//serializeObjects(os, version); // DEPRECATED
+		// count=0
+		writeU16(os, 0);
 	}
 	
 	// Versions up from 15 have static objects.
diff --git a/src/mapblock.h b/src/mapblock.h
index dd1d5e5a..ca36499a 100644
--- a/src/mapblock.h
+++ b/src/mapblock.h
@@ -366,10 +366,10 @@ public:
 		DEPRECATED
 	*/
 	
-	void serializeObjects(std::ostream &os, u8 version)
+	/*void serializeObjects(std::ostream &os, u8 version)
 	{
 		m_objects.serialize(os, version);
-	}
+	}*/
 	// If smgr!=NULL, new objects are added to the scene
 	void updateObjects(std::istream &is, u8 version,
 			scene::ISceneManager *smgr, u32 daynight_ratio)
diff --git a/src/server.cpp b/src/server.cpp
index 9fa957c2..d3627a93 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -873,7 +873,9 @@ void RemoteClient::SendObjectData(
 			bos.write((char*)buf, 6);
 
 			// Write objects
-			block->serializeObjects(bos, serialization_version);
+			//block->serializeObjects(bos, serialization_version); // DEPRECATED
+			// count=0
+			writeU16(bos, 0);
 
 			blockcount++;
 
-- 
2.30.2