Fix empty legacy meta being persisted

rubenwardy · paramat · commit 557bbc670451 · 2017-09-10T01:30:42.000+01:00
diff --git a/src/itemstackmetadata.cpp b/src/itemstackmetadata.cpp
@@ -14,8 +14,9 @@ void ItemStackMetadata::serialize(std::ostream &os) const
 	std::ostringstream os2;
 	os2 << DESERIALIZE_START;
 	for (const auto &stringvar : m_stringvars) {
-		os2 << stringvar.first << DESERIALIZE_KV_DELIM
-		    << stringvar.second << DESERIALIZE_PAIR_DELIM;
+		if (!stringvar.first.empty() || !stringvar.second.empty())
+			os2 << stringvar.first << DESERIALIZE_KV_DELIM
+				<< stringvar.second << DESERIALIZE_PAIR_DELIM;
 	}
 	os << serializeJsonStringIfNeeded(os2.str());
 }

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,9 @@ void ItemStackMetadata::serialize(std::ostream &os) const`
`14`	`14`	`std::ostringstream os2;`
`15`	`15`	`os2 << DESERIALIZE_START;`
`16`	`16`	`for (const auto &stringvar : m_stringvars) {`
`17`		`- os2 << stringvar.first << DESERIALIZE_KV_DELIM`
`18`		`- << stringvar.second << DESERIALIZE_PAIR_DELIM;`
	`17`	`+ if (!stringvar.first.empty() \|\| !stringvar.second.empty())`
	`18`	`+ os2 << stringvar.first << DESERIALIZE_KV_DELIM`
	`19`	`+ << stringvar.second << DESERIALIZE_PAIR_DELIM;`
`19`	`20`	`}`
`20`	`21`	`os << serializeJsonStringIfNeeded(os2.str());`
`21`	`22`	`}`