flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Added 1.5.2 compatibility.

Browse Source 
FS #372

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1461 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2013-05-08 11:10:55 +00:00
parent 2078d15ad9
commit da85eb9db2
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/Protocol/Protocol15x.cpp
View File

@ -5,6 +5,7 @@
Implements the 1.5.x protocol classes: Implements the 1.5.x protocol classes:
- cProtocol150 - cProtocol150
- release 1.5 protocol (#60) - 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) (others may be added later in the future for the 1.5 release series)
*/ */

4
source/Protocol/Protocol15x.h
View File

@ -4,8 +4,8 @@
/* /*
Declares the 1.5.x protocol classes: Declares the 1.5.x protocol classes:
- cProtocol150 - cProtocol150
- release 1.5 protocol (#60) - release 1.5 and 1.5.1 protocol (#60)
(others may be added later in the future for the 1.5 release series) - release 1.5.2 protocol (#61; no relevant changes found)
*/ */

3
source/Protocol/ProtocolRecognizer.cpp
View File

@ -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_4: return "1.4.4";
case PROTO_VERSION_1_4_6: return "1.4.6"; case PROTO_VERSION_1_4_6: return "1.4.6";
case PROTO_VERSION_1_5_0: return "1.5"; case PROTO_VERSION_1_5_0: return "1.5";
case PROTO_VERSION_1_5_2: return "1.5.2";
} }
ASSERT(!"Unknown protocol version"); ASSERT(!"Unknown protocol version");
return Printf("Unknown protocol (%d)", a_ProtocolVersion); return Printf("Unknown protocol (%d)", a_ProtocolVersion);
@ -650,6 +651,7 @@ bool cProtocolRecognizer::TryRecognizeProtocol(void)
return true; return true;
} }
case PROTO_VERSION_1_5_0: case PROTO_VERSION_1_5_0:
case PROTO_VERSION_1_5_2:
{ {
m_Protocol = new cProtocol150(m_Client); m_Protocol = new cProtocol150(m_Client);
return true; return true;
@ -686,6 +688,7 @@ void cProtocolRecognizer::HandleServerPing(void)
case PROTO_VERSION_1_4_4: case PROTO_VERSION_1_4_4:
case PROTO_VERSION_1_4_6: case PROTO_VERSION_1_4_6:
case PROTO_VERSION_1_5_0: 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. // 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 // http://wiki.vg/wiki/index.php?title=Protocol&oldid=3101#Server_List_Ping_.280xFE.29

5
source/Protocol/ProtocolRecognizer.h
View File

@ -18,8 +18,8 @@
// Adjust these if a new protocol is added or an old one is removed: // 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_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" #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_4 = 49,
PROTO_VERSION_1_4_6 = 51, PROTO_VERSION_1_4_6 = 51,
PROTO_VERSION_1_5_0 = 60, PROTO_VERSION_1_5_0 = 60,
PROTO_VERSION_1_5_2 = 61,
PROTO_VERSION_NEXT, PROTO_VERSION_NEXT,
PROTO_VERSION_LATEST = PROTO_VERSION_NEXT - 1, ///< Automatically assigned to the last protocol version, this serves as the default for PrimaryServerVersion PROTO_VERSION_LATEST = PROTO_VERSION_NEXT - 1, ///< Automatically assigned to the last protocol version, this serves as the default for PrimaryServerVersion