Index: src/network/network_server.cpp
===================================================================
--- src/network/network_server.cpp	(revision 21182)
+++ src/network/network_server.cpp	(working copy)
@@ -412,8 +412,7 @@
 		}

 		/* Send all packets (forced) and check if we have send it all */
-		cs->Send_Packets();
-		if (cs->IsPacketQueueEmpty()) {
+		if (cs->Send_Packets() && cs->IsPacketQueueEmpty()) {
 			/* All are sent, increase the sent_packets */
 			sent_packets *= 2;
 		} else {
Index: src/network/network.cpp
===================================================================
--- src/network/network.cpp	(revision 21182)
+++ src/network/network.cpp	(working copy)
@@ -675,7 +675,7 @@
 	FOR_ALL_CLIENT_SOCKETS(cs) {
 		if (!_network_server) {
 			SEND_COMMAND(PACKET_CLIENT_QUIT)();
-			cs->Send_Packets();
+			cs->Send_Packets(true);
 		}
 		NetworkCloseClient(cs, NETWORK_RECV_STATUS_CONN_LOST);
 	}
@@ -1006,9 +1006,7 @@
 	NetworkClientSocket *cs;
 	FOR_ALL_CLIENT_SOCKETS(cs) {
 		if (cs->writable) {
-			cs->Send_Packets();
-
-			if (cs->status == STATUS_MAP) {
+			if (cs->Send_Packets() && cs->status == STATUS_MAP) {
 				/* This client is in the middle of a map-send, call the function for that */
 				SEND_COMMAND(PACKET_SERVER_MAP)(cs);
 			}