From 009149a073ac02dd412af3c203979157976c0dd8 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Sat, 21 Feb 2015 17:24:27 +0100 Subject: Fix some memory leaks on packet sending. --- src/server.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'src/server.cpp') diff --git a/src/server.cpp b/src/server.cpp index 6c51aec4b..6a1e8085b 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2079,24 +2079,19 @@ void Server::sendRemoveNode(v3s16 p, u16 ignore_id, float maxd = far_d_nodes*BS; v3f p_f = intToFloat(p, BS); - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_REMOVENODE, 2 + 2 + 2); + NetworkPacket* pkt = new NetworkPacket(TOCLIENT_REMOVENODE, 6); *pkt << p; std::list clients = m_clients.getClientIDs(); for(std::list::iterator i = clients.begin(); - i != clients.end(); ++i) - { - if(far_players) - { + i != clients.end(); ++i) { + if(far_players) { // Get player - Player *player = m_env->getPlayer(*i); - if(player) - { + if(Player *player = m_env->getPlayer(*i)) { // If player is far away, only set modified blocks not sent v3f player_pos = player->getPosition(); - if(player_pos.getDistanceFrom(p_f) > maxd) - { + if(player_pos.getDistanceFrom(p_f) > maxd) { far_players->push_back(*i); continue; } @@ -2118,7 +2113,7 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id, v3f p_f = intToFloat(p, BS); std::list clients = m_clients.getClientIDs(); - for(std::list::iterator + for(std::list::iterator i = clients.begin(); i != clients.end(); ++i) { @@ -2139,7 +2134,7 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id, } } - NetworkPacket* pkt = new NetworkPacket(TOCLIENT_ADDNODE, 0); + NetworkPacket* pkt = new NetworkPacket(TOCLIENT_ADDNODE, 6 + 2 + 1 + 1 + 1); m_clients.Lock(); RemoteClient* client = m_clients.lockedGetClientNoEx(*i); if (client != 0) { -- cgit v1.2.3