diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2015-04-05 11:37:53 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2015-04-05 11:39:38 +0200 |
| commit | 8804c47e59b550ec9a533de662f086af623d68c1 (patch) | |
| tree | 244d404f2d3b38af062843194929282c6c91615d /src/server.cpp | |
| parent | ed3ebd633d23184c65128fae72f2b6c10c932e73 (diff) | |
| download | minetest-8804c47e59b550ec9a533de662f086af623d68c1.tar.gz minetest-8804c47e59b550ec9a533de662f086af623d68c1.tar.bz2 minetest-8804c47e59b550ec9a533de662f086af623d68c1.zip | |
TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD can be unreliable, catch PacketError exception.
Also set the packet size at creation not when pushing rawString, no functional change
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server.cpp b/src/server.cpp index 4971e6f66..cb62f7e86 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1897,7 +1897,7 @@ void Server::SendPlayerInventoryFormspec(u16 peer_id) u32 Server::SendActiveObjectRemoveAdd(u16 peer_id, const std::string &datas) { - NetworkPacket pkt(TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD, 0, peer_id); + NetworkPacket pkt(TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD, datas.size(), peer_id); pkt.putRawString(datas.c_str(), datas.size()); Send(&pkt); return pkt.getSize(); @@ -1906,7 +1906,7 @@ u32 Server::SendActiveObjectRemoveAdd(u16 peer_id, const std::string &datas) void Server::SendActiveObjectMessages(u16 peer_id, const std::string &datas, bool reliable) { NetworkPacket pkt(TOCLIENT_ACTIVE_OBJECT_MESSAGES, - 0, peer_id); + datas.size(), peer_id); pkt.putRawString(datas.c_str(), datas.size()); |