diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-09-19 14:31:18 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-09-19 14:31:18 +0200 |
| commit | 4398156b2e56ccfcb41f750906501ecf446be045 (patch) | |
| tree | dc1c070c6c7490619d8b05e30ace2c959f085bb2 /src/Protocol | |
| parent | Derp (diff) | |
| parent | QtBiomeVisualiser: More gcc fixes. (diff) | |
| download | cuberite-4398156b2e56ccfcb41f750906501ecf446be045.tar cuberite-4398156b2e56ccfcb41f750906501ecf446be045.tar.gz cuberite-4398156b2e56ccfcb41f750906501ecf446be045.tar.bz2 cuberite-4398156b2e56ccfcb41f750906501ecf446be045.tar.lz cuberite-4398156b2e56ccfcb41f750906501ecf446be045.tar.xz cuberite-4398156b2e56ccfcb41f750906501ecf446be045.tar.zst cuberite-4398156b2e56ccfcb41f750906501ecf446be045.zip | |
Diffstat (limited to 'src/Protocol')
| -rw-r--r-- | src/Protocol/Protocol17x.cpp | 13 | ||||
| -rw-r--r-- | src/Protocol/ProtocolRecognizer.cpp | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp index 05935fbe1..2fbc58541 100644 --- a/src/Protocol/Protocol17x.cpp +++ b/src/Protocol/Protocol17x.cpp @@ -102,6 +102,19 @@ cProtocol172::cProtocol172(cClientHandle * a_Client, const AString & a_ServerAdd m_IsEncrypted(false), m_LastSentDimension(dimNotSet) { + // BungeeCord handling: + // If BC is setup with ip_forward == true, it sends additional data in the login packet's ServerAddress field: + // hostname\00ip-address\00uuid\00profile-properties-as-json + AStringVector Params; + if (cRoot::Get()->GetServer()->ShouldAllowBungeeCord() && SplitZeroTerminatedStrings(a_ServerAddress, Params) && (Params.size() == 4)) + { + LOGD("Player at %s connected via BungeeCord", Params[1].c_str()); + m_ServerAddress = Params[0]; + m_Client->SetIPString(Params[1]); + m_Client->SetUUID(cMojangAPI::MakeUUIDShort(Params[2])); + m_Client->SetProperties(Params[3]); + } + // Create the comm log file, if so requested: if (g_ShouldLogCommIn || g_ShouldLogCommOut) { diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp index 36e791fc7..4516975bf 100644 --- a/src/Protocol/ProtocolRecognizer.cpp +++ b/src/Protocol/ProtocolRecognizer.cpp @@ -28,7 +28,7 @@ cProtocolRecognizer::cProtocolRecognizer(cClientHandle * a_Client) : super(a_Client), m_Protocol(NULL), - m_Buffer(512) + m_Buffer(8192) // We need a larger buffer to support BungeeCord - it sends one huge packet at the start { } |