Merge branch 'master' into 1.8-Protocol

2014-09-19 14:31:18 +02:00
parent 52c875531e 09c67bddf7
commit 4398156b2e
31 changed files with 650 additions and 362 deletions
--- a/src/Protocol/ProtocolRecognizer.cpp
+++ b/src/Protocol/ProtocolRecognizer.cpp
@@ -28,7 +28,7 @@
 cProtocolRecognizer::cProtocolRecognizer(cClientHandle * a_Client) :
 	super(a_Client),
 	m_Protocol(NULL),
-	m_Buffer(512)
+	m_Buffer(8192)     // We need a larger buffer to support BungeeCord - it sends one huge packet at the start
 {
 }