diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-09-26 20:30:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 20:30:14 +0200 |
| commit | 50423d8c729ee133035e3bb1e244bfbd1bdc0ef0 (patch) | |
| tree | 4605bc80aed2d0f729047697b23e709ade2510e5 /src/remoteplayer.cpp | |
| parent | f7e57a0d20879e1d1956e36d782a3ab98aa84e38 (diff) | |
| download | minetest-50423d8c729ee133035e3bb1e244bfbd1bdc0ef0.tar.gz minetest-50423d8c729ee133035e3bb1e244bfbd1bdc0ef0.tar.bz2 minetest-50423d8c729ee133035e3bb1e244bfbd1bdc0ef0.zip | |
Update JsonCPP to 1.8.3 (#6466)
* Update JsonCPP to 1.8.3
* Fix deprecated functions
Json::FastWriter, Json::StyledWriter and Json::Reader are marked deprecated since 1.1 and are deprecated in 0.8 but not shown at compilation time.
Use new methods to serialize/deserialize
Diffstat (limited to 'src/remoteplayer.cpp')
| -rw-r--r-- | src/remoteplayer.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/remoteplayer.cpp b/src/remoteplayer.cpp index c108ad3f1..f8f31d928 100644 --- a/src/remoteplayer.cpp +++ b/src/remoteplayer.cpp @@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "porting.h" // strlcpy #include "server.h" #include "settings.h" +#include "convert_json.h" /* RemotePlayer @@ -76,8 +77,8 @@ void RemotePlayer::serializeExtraAttributes(std::string &output) json_root[attr.first] = attr.second; } - Json::FastWriter writer; - output = writer.write(json_root); + output = fastWriteJson(json_root); + m_sao->setExtendedAttributeModified(false); } @@ -120,9 +121,13 @@ void RemotePlayer::deSerialize(std::istream &is, const std::string &playername, try { const std::string &extended_attributes = args.get("extended_attributes"); - Json::Reader reader; + std::istringstream iss(extended_attributes); + Json::CharReaderBuilder builder; + builder.settings_["collectComments"] = false; + std::string errs; + Json::Value attr_root; - reader.parse(extended_attributes, attr_root); + Json::parseFromStream(builder, iss, &attr_root, &errs); const Json::Value::Members attr_list = attr_root.getMemberNames(); for (const auto &it : attr_list) { |