summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-09-17 16:01:14 +0200
committermadmaxoft <github@xoft.cz>2014-09-17 16:01:14 +0200
commit010879e43f591726809800b45d783d247508daa1 (patch)
tree5e86d113d61b8804b1b76bb58778e17b7038de3d
parentFull BungeeCord compatibility. (diff)
downloadcuberite-010879e43f591726809800b45d783d247508daa1.tar
cuberite-010879e43f591726809800b45d783d247508daa1.tar.gz
cuberite-010879e43f591726809800b45d783d247508daa1.tar.bz2
cuberite-010879e43f591726809800b45d783d247508daa1.tar.lz
cuberite-010879e43f591726809800b45d783d247508daa1.tar.xz
cuberite-010879e43f591726809800b45d783d247508daa1.tar.zst
cuberite-010879e43f591726809800b45d783d247508daa1.zip
Diffstat (limited to '')
-rw-r--r--src/ClientHandle.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 170498037..4a3a3c250 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -312,8 +312,16 @@ void cClientHandle::Authenticate(const AString & a_Name, const AString & a_UUID,
ASSERT(m_Player == NULL);
m_Username = a_Name;
- m_UUID = a_UUID;
- m_Properties = a_Properties;
+
+ // Only assign UUID and properties if not already pre-assigned (BungeeCord sends those in the Handshake packet):
+ if (m_UUID.empty())
+ {
+ m_UUID = a_UUID;
+ }
+ if (m_Properties.empty())
+ {
+ m_Properties = a_Properties;
+ }
// Send login success (if the protocol supports it):
m_Protocol->SendLoginSuccess();