Modify default active block range

[minetest.git] / src / connection.cpp

diff --git a/src/connection.cpp b/src/connection.cpp
index 548a7f532fa58ddb483ad7eb9e04d69523f3730b..0f09753bd413dbfd8453522b093595adb09c1da9 100644 (file)
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -1102,6 +1102,11 @@ u32 Connection::Receive(u16 &peer_id, u8 *data, u32 datasize)
                if(m_socket.WaitData(0) == true)
                        continue;
        }
+       catch(SendFailedException &e)
+       {
+               derr_con<<"Receive(): SendFailedException; peer_id="
+                               <<peer_id<<std::endl;
+       }
        } // for
 }
 
@@ -1121,7 +1126,9 @@ void Connection::Send(u16 peer_id, u8 channelnum,
 {
        assert(channelnum < CHANNEL_COUNT);
        
-       Peer *peer = GetPeer(peer_id);
+       Peer *peer = GetPeerNoEx(peer_id);
+       if(peer == NULL)
+               return;
        Channel *channel = &(peer->channels[channelnum]);
 
        u32 chunksize_max = m_max_packet_size - BASE_HEADER_SIZE;