summaryrefslogtreecommitdiffstats
path: root/src/ClientHandle.cpp
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-09-19 17:33:22 +0200
committerHowaner <franzi.moos@googlemail.com>2014-09-19 17:33:22 +0200
commit09ca7d144afaa4c3fb7727390d11a10c3a29d98e (patch)
tree4dadccef8ed72f8954b8d079f901709b578f6171 /src/ClientHandle.cpp
parentCreated MobSpawnerEntity class. (diff)
parentQtBiomeVisualiser: More gcc fixes. (diff)
downloadcuberite-09ca7d144afaa4c3fb7727390d11a10c3a29d98e.tar
cuberite-09ca7d144afaa4c3fb7727390d11a10c3a29d98e.tar.gz
cuberite-09ca7d144afaa4c3fb7727390d11a10c3a29d98e.tar.bz2
cuberite-09ca7d144afaa4c3fb7727390d11a10c3a29d98e.tar.lz
cuberite-09ca7d144afaa4c3fb7727390d11a10c3a29d98e.tar.xz
cuberite-09ca7d144afaa4c3fb7727390d11a10c3a29d98e.tar.zst
cuberite-09ca7d144afaa4c3fb7727390d11a10c3a29d98e.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();