diff options
author | peterbell10 <peterbell10@live.co.uk> | 2018-07-26 23:24:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-26 23:24:36 +0200 |
commit | 950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3 (patch) | |
tree | 5e6fde4625714922e970bd5ad4ea339f58ab6b57 /src/Protocol | |
parent | At long last... Piston animations! (diff) | |
download | cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.gz cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.bz2 cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.lz cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.xz cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.zst cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Protocol/ForgeHandshake.cpp | 3 | ||||
-rw-r--r-- | src/Protocol/MojangAPI.cpp | 1 | ||||
-rw-r--r-- | src/Protocol/ProtocolRecognizer.cpp | 3 | ||||
-rw-r--r-- | src/Protocol/Protocol_1_11.cpp | 2 | ||||
-rw-r--r-- | src/Protocol/Protocol_1_8.cpp | 3 | ||||
-rw-r--r-- | src/Protocol/Protocol_1_9.cpp | 4 |
6 files changed, 11 insertions, 5 deletions
diff --git a/src/Protocol/ForgeHandshake.cpp b/src/Protocol/ForgeHandshake.cpp index b6f7a7c94..8c16d4f0c 100644 --- a/src/Protocol/ForgeHandshake.cpp +++ b/src/Protocol/ForgeHandshake.cpp @@ -181,6 +181,7 @@ AStringMap cForgeHandshake::ParseModList(const char * a_Data, size_t a_Size) + void cForgeHandshake::HandleClientHello(cClientHandle * a_Client, const char * a_Data, size_t a_Size) { if (a_Size == 2) @@ -201,6 +202,7 @@ void cForgeHandshake::HandleClientHello(cClientHandle * a_Client, const char * a + void cForgeHandshake::HandleModList(cClientHandle * a_Client, const char * a_Data, size_t a_Size) { LOGD("Received ModList"); @@ -248,6 +250,7 @@ void cForgeHandshake::HandleModList(cClientHandle * a_Client, const char * a_Dat + void cForgeHandshake::HandleHandshakeAck(cClientHandle * a_Client, const char * a_Data, size_t a_Size) { if (a_Size != 2) diff --git a/src/Protocol/MojangAPI.cpp b/src/Protocol/MojangAPI.cpp index 5aa7f58db..fdaec346f 100644 --- a/src/Protocol/MojangAPI.cpp +++ b/src/Protocol/MojangAPI.cpp @@ -38,7 +38,6 @@ const int MAX_PER_QUERY = 100; - /** Returns the CA certificates that should be trusted for Mojang-related connections. */ static cX509CertPtr GetCACerts(void) { diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp index 27ed2e6ad..c10d43e3e 100644 --- a/src/Protocol/ProtocolRecognizer.cpp +++ b/src/Protocol/ProtocolRecognizer.cpp @@ -191,6 +191,7 @@ void cProtocolRecognizer::SendBlockChanges(int a_ChunkX, int a_ChunkZ, const sSe + void cProtocolRecognizer::SendCameraSetTo(const cEntity & a_Entity) { ASSERT(m_Protocol != nullptr); @@ -288,6 +289,7 @@ void cProtocolRecognizer::SendDisconnect(const AString & a_Reason) + void cProtocolRecognizer::SendEditSign(int a_BlockX, int a_BlockY, int a_BlockZ) { ASSERT(m_Protocol != nullptr); @@ -438,7 +440,6 @@ void cProtocolRecognizer::SendHeldItemChange(int a_ItemIndex) - void cProtocolRecognizer::SendHideTitle(void) { ASSERT(m_Protocol != nullptr); diff --git a/src/Protocol/Protocol_1_11.cpp b/src/Protocol/Protocol_1_11.cpp index ebbcbade2..f0f7f855a 100644 --- a/src/Protocol/Protocol_1_11.cpp +++ b/src/Protocol/Protocol_1_11.cpp @@ -520,7 +520,6 @@ void cProtocol_1_11_0::WriteBlockEntity(cPacketizer & a_Pkt, const cBlockEntity - void cProtocol_1_11_0::SendTitleTimes(int a_FadeInTicks, int a_DisplayTicks, int a_FadeOutTicks) { ASSERT(m_State == 3); // In game mode? @@ -536,7 +535,6 @@ void cProtocol_1_11_0::SendTitleTimes(int a_FadeInTicks, int a_DisplayTicks, int - void cProtocol_1_11_0::HandlePacketBlockPlace(cByteBuffer & a_ByteBuffer) { int BlockX, BlockY, BlockZ; diff --git a/src/Protocol/Protocol_1_8.cpp b/src/Protocol/Protocol_1_8.cpp index 5055526df..2101fa6f1 100644 --- a/src/Protocol/Protocol_1_8.cpp +++ b/src/Protocol/Protocol_1_8.cpp @@ -710,6 +710,7 @@ void cProtocol_1_8_0::SendLogin(const cPlayer & a_Player, const cWorld & a_World + void cProtocol_1_8_0::SendLoginSuccess(void) { ASSERT(m_State == 2); // State: login? @@ -1550,6 +1551,7 @@ void cProtocol_1_8_0::SendUnloadChunk(int a_ChunkX, int a_ChunkZ) + void cProtocol_1_8_0::SendUpdateBlockEntity(cBlockEntity & a_BlockEntity) { ASSERT(m_State == 3); // In game mode? @@ -2060,6 +2062,7 @@ void cProtocol_1_8_0::AddReceivedData(const char * a_Data, size_t a_Size) + bool cProtocol_1_8_0::HandlePacket(cByteBuffer & a_ByteBuffer, UInt32 a_PacketType) { switch (m_State) diff --git a/src/Protocol/Protocol_1_9.cpp b/src/Protocol/Protocol_1_9.cpp index 73b81580e..95406613c 100644 --- a/src/Protocol/Protocol_1_9.cpp +++ b/src/Protocol/Protocol_1_9.cpp @@ -649,7 +649,6 @@ void cProtocol_1_9_0::SendHeldItemChange(int a_ItemIndex) - void cProtocol_1_9_0::SendHideTitle(void) { ASSERT(m_State == 3); // In game mode? @@ -751,6 +750,7 @@ void cProtocol_1_9_0::SendLogin(const cPlayer & a_Player, const cWorld & a_World + void cProtocol_1_9_0::SendLoginSuccess(void) { ASSERT(m_State == 2); // State: login? @@ -1597,6 +1597,7 @@ void cProtocol_1_9_0::SendUnloadChunk(int a_ChunkX, int a_ChunkZ) + void cProtocol_1_9_0::SendUpdateBlockEntity(cBlockEntity & a_BlockEntity) { ASSERT(m_State == 3); // In game mode? @@ -2107,6 +2108,7 @@ void cProtocol_1_9_0::AddReceivedData(const char * a_Data, size_t a_Size) + bool cProtocol_1_9_0::HandlePacket(cByteBuffer & a_ByteBuffer, UInt32 a_PacketType) { switch (m_State) |