summaryrefslogtreecommitdiffstats
path: root/source/Protocol/ProtocolRecognizer.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-07-05 21:40:19 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-07-05 21:40:19 +0200
commitde5cec741985a7c2be52d0629a79b616921b6d57 (patch)
tree4ba655ce0e642c39e0c29cdca971af2b15ba8634 /source/Protocol/ProtocolRecognizer.cpp
parentFixed a crash when moving a player to a non-existent world (reported by tonibm19) (diff)
downloadcuberite-de5cec741985a7c2be52d0629a79b616921b6d57.tar
cuberite-de5cec741985a7c2be52d0629a79b616921b6d57.tar.gz
cuberite-de5cec741985a7c2be52d0629a79b616921b6d57.tar.bz2
cuberite-de5cec741985a7c2be52d0629a79b616921b6d57.tar.lz
cuberite-de5cec741985a7c2be52d0629a79b616921b6d57.tar.xz
cuberite-de5cec741985a7c2be52d0629a79b616921b6d57.tar.zst
cuberite-de5cec741985a7c2be52d0629a79b616921b6d57.zip
Diffstat (limited to 'source/Protocol/ProtocolRecognizer.cpp')
-rw-r--r--source/Protocol/ProtocolRecognizer.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/Protocol/ProtocolRecognizer.cpp b/source/Protocol/ProtocolRecognizer.cpp
index 518d03058..f7c3a1670 100644
--- a/source/Protocol/ProtocolRecognizer.cpp
+++ b/source/Protocol/ProtocolRecognizer.cpp
@@ -11,6 +11,7 @@
#include "Protocol132.h"
#include "Protocol14x.h"
#include "Protocol15x.h"
+#include "Protocol16x.h"
#include "../ClientHandle.h"
#include "../Root.h"
#include "../World.h"
@@ -51,6 +52,7 @@ AString cProtocolRecognizer::GetVersionTextFromInt(int a_ProtocolVersion)
case PROTO_VERSION_1_4_6: return "1.4.6";
case PROTO_VERSION_1_5_0: return "1.5";
case PROTO_VERSION_1_5_2: return "1.5.2";
+ case PROTO_VERSION_1_6_1: return "1.6.1";
}
ASSERT(!"Unknown protocol version");
return Printf("Unknown protocol (%d)", a_ProtocolVersion);
@@ -656,6 +658,11 @@ bool cProtocolRecognizer::TryRecognizeProtocol(void)
m_Protocol = new cProtocol150(m_Client);
return true;
}
+ case PROTO_VERSION_1_6_1:
+ {
+ m_Protocol = new cProtocol161(m_Client);
+ return true;
+ }
}
m_Protocol = new cProtocol125(m_Client);
return true;
@@ -689,6 +696,7 @@ void cProtocolRecognizer::HandleServerPing(void)
case PROTO_VERSION_1_4_6:
case PROTO_VERSION_1_5_0:
case PROTO_VERSION_1_5_2:
+ case PROTO_VERSION_1_6_1:
{
// The server list ping now has 1 more byte of "magic". Mojang just loves to complicate stuff.
// http://wiki.vg/wiki/index.php?title=Protocol&oldid=3101#Server_List_Ping_.280xFE.29