diff options
| author | tycho <work.tycho@gmail.com> | 2015-10-03 23:38:52 +0200 |
|---|---|---|
| committer | tycho <work.tycho@gmail.com> | 2015-12-18 19:14:34 +0100 |
| commit | 939ebbee58152b95048dd7410879e2e73c997776 (patch) | |
| tree | 53d3ec752486299525c22f3750a1813f0e7032b0 /src/Protocol/ProtocolRecognizer.cpp | |
| parent | Broken (diff) | |
| download | cuberite-939ebbee58152b95048dd7410879e2e73c997776.tar cuberite-939ebbee58152b95048dd7410879e2e73c997776.tar.gz cuberite-939ebbee58152b95048dd7410879e2e73c997776.tar.bz2 cuberite-939ebbee58152b95048dd7410879e2e73c997776.tar.lz cuberite-939ebbee58152b95048dd7410879e2e73c997776.tar.xz cuberite-939ebbee58152b95048dd7410879e2e73c997776.tar.zst cuberite-939ebbee58152b95048dd7410879e2e73c997776.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Protocol/ProtocolRecognizer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp index 1c4333305..4b23daf22 100644 --- a/src/Protocol/ProtocolRecognizer.cpp +++ b/src/Protocol/ProtocolRecognizer.cpp @@ -15,6 +15,7 @@ #include "../World.h" #include "../ChatColor.h" #include "Bindings/PluginManager.h" +#include "Packetizer.h" @@ -177,7 +178,7 @@ void cProtocolRecognizer::SendDestroyEntity(const cEntity & a_Entity) -void cProtocolRecognizer::SendDisconnect(cByteBuffer & a_ByteBuffer, const AString & a_Reason) +void cProtocolRecognizer::SendDisconnect(AString & a_ByteBuffer, const AString & a_Reason) { if (m_Protocol != nullptr) { @@ -185,19 +186,18 @@ void cProtocolRecognizer::SendDisconnect(cByteBuffer & a_ByteBuffer, const AStri } else { + // This is used when the client sends a server-ping, respond with the default packet: - static const int Packet = 0xff; // PACKET_DISCONNECT - a_ByteBuffer.Write(reinterpret_cast<const char *>(&Packet), 1); // WriteByte() + cPacketizer Pkt(*this, 0xff); auto UTF16 = UTF8ToRawBEUTF16(a_Reason); - static const u_short Size = htons(static_cast<u_short>(UTF16.size())); - SendData(reinterpret_cast<const char *>(&Size), 2); // WriteShort() - SendData(reinterpret_cast<const char *>(UTF16.data()), UTF16.size() * sizeof(char16_t)); // WriteString() + Pkt.WriteBEUInt16(static_cast<UInt16>(UTF16.size())); + Pkt.WriteBuf(reinterpret_cast<const char *>(UTF16.data()), UTF16.size() * sizeof(char16_t)); } } -e + void cProtocolRecognizer::SendEditSign(int a_BlockX, int a_BlockY, int a_BlockZ) { |