Fix detach inventory serialisation (#8331)

diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 3e50173a6d1571aa11c28211e85b81322ca4dc50..889002a82d21c79c522c3a537b1b5e0d3848fd74 100644 (file)
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.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);
 }

diff --git a/src/server.cpp b/src/server.cpp
index ad469d655f7c0ec1d95bf275a9983468d318f526..701339ad8eb93f4fa8b61bdb19d1d636579e4203 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -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)