summaryrefslogtreecommitdiffstats
path: root/source/Protocol
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-08 13:10:55 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-08 13:10:55 +0200
commitda85eb9db2a43f37dd6a40739b71b12124a9c918 (patch)
treeb134ec489be3d4b1888ebce2ad08fbd478bfaefc /source/Protocol
parentProtoProxy: Added server-ping parsing (diff)
downloadcuberite-da85eb9db2a43f37dd6a40739b71b12124a9c918.tar
cuberite-da85eb9db2a43f37dd6a40739b71b12124a9c918.tar.gz
cuberite-da85eb9db2a43f37dd6a40739b71b12124a9c918.tar.bz2
cuberite-da85eb9db2a43f37dd6a40739b71b12124a9c918.tar.lz
cuberite-da85eb9db2a43f37dd6a40739b71b12124a9c918.tar.xz
cuberite-da85eb9db2a43f37dd6a40739b71b12124a9c918.tar.zst
cuberite-da85eb9db2a43f37dd6a40739b71b12124a9c918.zip
Diffstat (limited to '')
-rw-r--r--source/Protocol/Protocol15x.cpp1
-rw-r--r--source/Protocol/Protocol15x.h4
-rw-r--r--source/Protocol/ProtocolRecognizer.cpp3
-rw-r--r--source/Protocol/ProtocolRecognizer.h5
4 files changed, 9 insertions, 4 deletions
diff --git a/source/Protocol/Protocol15x.cpp b/source/Protocol/Protocol15x.cpp
index 78792af19..d5ab05ea6 100644
--- a/source/Protocol/Protocol15x.cpp
+++ b/source/Protocol/Protocol15x.cpp
@@ -5,6 +5,7 @@
Implements the 1.5.x protocol classes:
- cProtocol150
- release 1.5 protocol (#60)
+ - release 1.5.2 protocol (#61, no relevant changes found)
(others may be added later in the future for the 1.5 release series)
*/
diff --git a/source/Protocol/Protocol15x.h b/source/Protocol/Protocol15x.h
index a1c665ab4..73d73780d 100644
--- a/source/Protocol/Protocol15x.h
+++ b/source/Protocol/Protocol15x.h
@@ -4,8 +4,8 @@
/*
Declares the 1.5.x protocol classes:
- cProtocol150
- - release 1.5 protocol (#60)
-(others may be added later in the future for the 1.5 release series)
+ - release 1.5 and 1.5.1 protocol (#60)
+ - release 1.5.2 protocol (#61; no relevant changes found)
*/
diff --git a/source/Protocol/ProtocolRecognizer.cpp b/source/Protocol/ProtocolRecognizer.cpp
index cae267524..3b971cf49 100644
--- a/source/Protocol/ProtocolRecognizer.cpp
+++ b/source/Protocol/ProtocolRecognizer.cpp
@@ -50,6 +50,7 @@ AString cProtocolRecognizer::GetVersionTextFromInt(int a_ProtocolVersion)
case PROTO_VERSION_1_4_4: return "1.4.4";
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";
}
ASSERT(!"Unknown protocol version");
return Printf("Unknown protocol (%d)", a_ProtocolVersion);
@@ -650,6 +651,7 @@ bool cProtocolRecognizer::TryRecognizeProtocol(void)
return true;
}
case PROTO_VERSION_1_5_0:
+ case PROTO_VERSION_1_5_2:
{
m_Protocol = new cProtocol150(m_Client);
return true;
@@ -686,6 +688,7 @@ void cProtocolRecognizer::HandleServerPing(void)
case PROTO_VERSION_1_4_4:
case PROTO_VERSION_1_4_6:
case PROTO_VERSION_1_5_0:
+ case PROTO_VERSION_1_5_2:
{
// 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
diff --git a/source/Protocol/ProtocolRecognizer.h b/source/Protocol/ProtocolRecognizer.h
index 1d301394c..768eb64c7 100644
--- a/source/Protocol/ProtocolRecognizer.h
+++ b/source/Protocol/ProtocolRecognizer.h
@@ -18,8 +18,8 @@
// Adjust these if a new protocol is added or an old one is removed:
-#define MCS_CLIENT_VERSIONS "1.2.4, 1.2.5, 1.3.1, 1.3.2, 1.4.2, 1.4.4, 1.4.5, 1.4.6, 1.4.7, 1.5"
-#define MCS_PROTOCOL_VERSIONS "29, 39, 47, 49, 51, 60"
+#define MCS_CLIENT_VERSIONS "1.2.4, 1.2.5, 1.3.1, 1.3.2, 1.4.2, 1.4.4, 1.4.5, 1.4.6, 1.4.7, 1.5, 1.5.1, 1.5.2"
+#define MCS_PROTOCOL_VERSIONS "29, 39, 47, 49, 51, 60, 61"
@@ -39,6 +39,7 @@ public:
PROTO_VERSION_1_4_4 = 49,
PROTO_VERSION_1_4_6 = 51,
PROTO_VERSION_1_5_0 = 60,
+ PROTO_VERSION_1_5_2 = 61,
PROTO_VERSION_NEXT,
PROTO_VERSION_LATEST = PROTO_VERSION_NEXT - 1, ///< Automatically assigned to the last protocol version, this serves as the default for PrimaryServerVersion