sfence
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix detach inventory serialisation (#8331)

master
rubenwardy 2019-03-07 06:41:21 +00:00 committed by Loïc Blot
parent 82c6363559
commit ac86d04784
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/clientpackethandler.cpp
View File

@ -895,8 +895,10 @@ void Client::handleCommand_DetachedInventory(NetworkPacket* pkt)
inv = inv_it->second; inv = inv_it->second;
} }
std::string contents; u16 ignore;
*pkt >> contents; *pkt >> ignore; // this used to be the length of the following string, ignore it
std::string contents = pkt->getRemainingString();
std::istringstream is(contents, std::ios::binary); std::istringstream is(contents, std::ios::binary);
inv->deSerialize(is); inv->deSerialize(is);
} }

5
src/server.cpp
View File

@ -2576,7 +2576,10 @@ void Server::sendDetachedInventory(const std::string &name, session_t peer_id)
// Serialization & NetworkPacket isn't a love story // Serialization & NetworkPacket isn't a love story
std::ostringstream os(std::ios_base::binary); std::ostringstream os(std::ios_base::binary);
inv_it->second->serialize(os); inv_it->second->serialize(os);
pkt << os.str();
std::string os_str = os.str();
pkt << static_cast<u16>(os_str.size()); // HACK: to keep compatibility with 5.0.0 clients
pkt.putRawString(os_str);
} }
if (peer_id == PEER_ID_INEXISTENT) if (peer_id == PEER_ID_INEXISTENT)