From ed772da0cce100be856fb1c3bbce949e333543fb Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 4 Jun 2012 22:43:33 +0300
Subject: Remove misdesigned exception from ReliablePacketBuffer

---
 src/connection.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/connection.cpp b/src/connection.cpp
index 127cabdc5..5bf47f13c 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -353,9 +353,11 @@ SharedBuffer<u8> IncomingSplitBuffer::insert(BufferedPacket &p, bool reliable)
 				<<" != sp->reliable="<<sp->reliable
 				<<std::endl;
 
-	// If chunk already exists, cancel
+	// If chunk already exists, ignore it.
+	// Sometimes two identical packets may arrive when there is network
+	// lag and the server re-sends stuff.
 	if(sp->chunks.find(chunk_num) != NULL)
-		throw AlreadyExistsException("Chunk already in buffer");
+		return SharedBuffer<u8>();
 	
 	// Cut chunk data out of packet
 	u32 chunkdatasize = p.data.getSize() - headersize;
-- 
cgit v1.2.3