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

Merge branch 'master' into 1.8-Protocol

Browse Source
This commit is contained in:
Howaner
2014-09-19 14:31:18 +02:00
parent 52c875531e 09c67bddf7
commit 4398156b2e
31 changed files with 650 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Protocol/Protocol17x.cpp
View File

@@ -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)
{