BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Do not serialize empty NodeMetadata

Browse Source 
This commit fixes #4516, though note that this will gradually fix MapBlocks
as they are used/modified and thus re-serialized.
This commit is contained in:
sfan5 2016-09-19 20:06:39 +02:00
parent 5091cb5ecd
commit 3a57e52500
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/nodemetadata.cpp
View File

@ -74,6 +74,11 @@ void NodeMetadata::clear()
m_inventory->clear(); m_inventory->clear();
} }
bool NodeMetadata::empty() const
{
return m_stringvars.size() == 0 && m_inventory->getLists().size() == 0;
}
/* /*
NodeMetadataList NodeMetadataList
*/ */
@ -84,14 +89,13 @@ void NodeMetadataList::serialize(std::ostream &os) const
Version 0 is a placeholder for "nothing to see here; go away." Version 0 is a placeholder for "nothing to see here; go away."
*/ */
if(m_data.empty()){ u16 count = countNonEmpty();
if (count == 0) {
writeU8(os, 0); // version writeU8(os, 0); // version
return; return;
} }
writeU8(os, 1); // version writeU8(os, 1); // version
u16 count = m_data.size();
writeU16(os, count); writeU16(os, count);
for(std::map<v3s16, NodeMetadata*>::const_iterator for(std::map<v3s16, NodeMetadata*>::const_iterator
@ -100,6 +104,8 @@ void NodeMetadataList::serialize(std::ostream &os) const
{ {
v3s16 p = i->first; v3s16 p = i->first;
NodeMetadata *data = i->second; NodeMetadata *data = i->second;
if (data->empty())
continue;
u16 p16 = p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE + p.Y * MAP_BLOCKSIZE + p.X; u16 p16 = p.Z * MAP_BLOCKSIZE * MAP_BLOCKSIZE + p.Y * MAP_BLOCKSIZE + p.X;
writeU16(os, p16); writeU16(os, p16);
@ -200,6 +206,17 @@ void NodeMetadataList::clear()
m_data.clear(); m_data.clear();
} }
int NodeMetadataList::countNonEmpty() const
{
int n = 0;
std::map<v3s16, NodeMetadata*>::const_iterator it;
for (it = m_data.begin(); it != m_data.end(); ++it) {
if (!it->second->empty())
n++;
}
return n;
}
std::string NodeMetadata::getString(const std::string &name, std::string NodeMetadata::getString(const std::string &name,
unsigned short recursion) const unsigned short recursion) const
{ {

3
src/nodemetadata.h
View File

@ -47,6 +47,7 @@ public:
void deSerialize(std::istream &is); void deSerialize(std::istream &is);
void clear(); void clear();
bool empty() const;
// Generic key/value store // Generic key/value store
std::string getString(const std::string &name, unsigned short recursion = 0) const; std::string getString(const std::string &name, unsigned short recursion = 0) const;
@ -94,6 +95,8 @@ public:
void clear(); void clear();
private: private:
int countNonEmpty() const;
std::map<v3s16, NodeMetadata *> m_data; std::map<v3s16, NodeMetadata *> m_data;
}; };