diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:57:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:57:47 +0100 |
| commit | 3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch) | |
| tree | c070350db219f2c4241d22bc31949685c7b42fe9 /src/itemstackmetadata.cpp | |
| parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
| parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
| download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/itemstackmetadata.cpp')
| -rw-r--r-- | src/itemstackmetadata.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/itemstackmetadata.cpp b/src/itemstackmetadata.cpp index 66dd71947..4aa1a0903 100644 --- a/src/itemstackmetadata.cpp +++ b/src/itemstackmetadata.cpp @@ -17,6 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + #include "itemstackmetadata.h" #include "util/serialize.h" #include "util/strfnd.h" @@ -50,8 +51,8 @@ void ItemStackMetadata::serialize(std::ostream &os) const os2 << DESERIALIZE_START; for (const auto &stringvar : m_stringvars) { if (!stringvar.first.empty() || !stringvar.second.empty()) - os2 << stringvar.first << DESERIALIZE_KV_DELIM << stringvar.second - << DESERIALIZE_PAIR_DELIM; + os2 << stringvar.first << DESERIALIZE_KV_DELIM + << stringvar.second << DESERIALIZE_PAIR_DELIM; } os << serializeJsonStringIfNeeded(os2.str()); } @@ -68,7 +69,7 @@ void ItemStackMetadata::deSerialize(std::istream &is) fnd.to(1); while (!fnd.at_end()) { std::string name = fnd.next(DESERIALIZE_KV_DELIM_STR); - std::string var = fnd.next(DESERIALIZE_PAIR_DELIM_STR); + std::string var = fnd.next(DESERIALIZE_PAIR_DELIM_STR); m_stringvars[name] = var; } } else { |