summaryrefslogtreecommitdiffstats
path: root/source/Protocol/ProtocolRecognizer.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-03-14 21:34:37 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-03-14 21:34:37 +0100
commit75cc675bf2fe0bf69c819b47a3235bbb6c14baaa (patch)
tree6eb2509ab8a349147162673d5650ff04be62a43c /source/Protocol/ProtocolRecognizer.cpp
parentAdded a Noop fluid simulator that doesn't do anything with the fluid (fluid doesn't spread at all, behaves like a normal block) (diff)
downloadcuberite-75cc675bf2fe0bf69c819b47a3235bbb6c14baaa.tar
cuberite-75cc675bf2fe0bf69c819b47a3235bbb6c14baaa.tar.gz
cuberite-75cc675bf2fe0bf69c819b47a3235bbb6c14baaa.tar.bz2
cuberite-75cc675bf2fe0bf69c819b47a3235bbb6c14baaa.tar.lz
cuberite-75cc675bf2fe0bf69c819b47a3235bbb6c14baaa.tar.xz
cuberite-75cc675bf2fe0bf69c819b47a3235bbb6c14baaa.tar.zst
cuberite-75cc675bf2fe0bf69c819b47a3235bbb6c14baaa.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 8a40376a3..935d89b9e 100644
--- a/source/Protocol/ProtocolRecognizer.cpp
+++ b/source/Protocol/ProtocolRecognizer.cpp
@@ -10,6 +10,7 @@
#include "Protocol125.h"
#include "Protocol132.h"
#include "Protocol14x.h"
+#include "Protocol15x.h"
#include "../ClientHandle.h"
#include "../Root.h"
#include "../World.h"
@@ -48,6 +49,7 @@ AString cProtocolRecognizer::GetVersionTextFromInt(int a_ProtocolVersion)
case PROTO_VERSION_1_4_2: return "1.4.2";
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";
}
ASSERT(!"Unknown protocol version");
return Printf("Unknown protocol (%d)", a_ProtocolVersion);
@@ -629,6 +631,11 @@ bool cProtocolRecognizer::TryRecognizeProtocol(void)
m_Protocol = new cProtocol146(m_Client);
return true;
}
+ case PROTO_VERSION_1_5_0:
+ {
+ m_Protocol = new cProtocol150(m_Client);
+ return true;
+ }
}
m_Protocol = new cProtocol125(m_Client);
return true;
@@ -660,6 +667,7 @@ void cProtocolRecognizer::HandleServerPing(void)
case PROTO_VERSION_1_4_2:
case PROTO_VERSION_1_4_4:
case PROTO_VERSION_1_4_6:
+ case PROTO_VERSION_1_5_0:
{
// 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