Skip to content
Permalink
Browse files

Fix detach inventory serialisation (#8331)

  • Loading branch information
rubenwardy authored and nerzhul committed Mar 7, 2019
1 parent 82c6363 commit ac86d047849f61999c52a20b3116ee4f8895d28d
Showing with 8 additions and 3 deletions.
  1. +4 −2 src/network/clientpackethandler.cpp
  2. +4 −1 src/server.cpp
@@ -895,8 +895,10 @@ void Client::handleCommand_DetachedInventory(NetworkPacket* pkt)
inv = inv_it->second;
}

std::string contents;
*pkt >> contents;
u16 ignore;
*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);
inv->deSerialize(is);
}
@@ -2576,7 +2576,10 @@ void Server::sendDetachedInventory(const std::string &name, session_t peer_id)
// Serialization & NetworkPacket isn't a love story
std::ostringstream os(std::ios_base::binary);
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)

0 comments on commit ac86d04

Please sign in to comment.