changed node metadata format to better accomodate future needs and problems

1 files changed, 14 insertions, 2 deletions

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index efa760f0e..a4e13320e 100644
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -1922,7 +1922,9 @@ void MapBlock::serialize(std::ostream &os, u8 version)
 		*/
 		if(version >= 14)
 		{
-			m_node_metadata.serialize(os);
+			std::ostringstream oss(std::ios_base::binary);
+			m_node_metadata.serialize(oss);
+			os<<serializeString(oss.str());
 		}
 	}
 }
@@ -2043,7 +2045,17 @@ void MapBlock::deSerialize(std::istream &is, u8 version)
 		*/
 		if(version >= 14)
 		{
-			m_node_metadata.deSerialize(is);
+			// Ignore errors
+			try{
+				std::string data = deSerializeString(is);
+				std::istringstream iss(data, std::ios_base::binary);
+				m_node_metadata.deSerialize(iss);
+			}
+			catch(SerializationError &e)
+			{
+				dstream<<"WARNING: MapBlock::deSerialize(): Ignoring an error"
+						<<" while deserializing node metadata"<<std::endl;
+			}
 		}
 	}