From e203cfd4a7509f459e8910120d8b039ed425125e Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Sat, 14 Mar 2020 14:02:58 -0500 Subject: [PATCH] Move back to XUID for Floodgate The normal identity UUID caused problems and caused the bedrock client to crash when using Floodgate. This was likely because on bedrock edition, it's a version 3 UUID opposed to java edition which uses version 4. --- .../java/org/geysermc/floodgate/util/BedrockData.java | 10 +++++----- .../connector/network/session/GeyserSession.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/org/geysermc/floodgate/util/BedrockData.java b/common/src/main/java/org/geysermc/floodgate/util/BedrockData.java index a94a2072..dc895a79 100644 --- a/common/src/main/java/org/geysermc/floodgate/util/BedrockData.java +++ b/common/src/main/java/org/geysermc/floodgate/util/BedrockData.java @@ -13,15 +13,15 @@ public class BedrockData { private String version; private String username; - private UUID bedrockId; + private String xuid; private int deviceId; private String languageCode; private int inputMode; private String ip; private int dataLength; - public BedrockData(String version, String username, UUID bedrockId, int deviceId, String languageCode, int inputMode, String ip) { - this(version, username, bedrockId, deviceId, languageCode, inputMode, ip, EXPECTED_LENGTH); + public BedrockData(String version, String username, String xuid, int deviceId, String languageCode, int inputMode, String ip) { + this(version, username, xuid, deviceId, languageCode, inputMode, ip, EXPECTED_LENGTH); } public static BedrockData fromString(String data) { @@ -29,7 +29,7 @@ public class BedrockData { if (split.length != EXPECTED_LENGTH) return null; return new BedrockData( - split[0], split[1], UUID.fromString(split[2]), Integer.parseInt(split[3]), + split[0], split[1], split[2], Integer.parseInt(split[3]), split[4], Integer.parseInt(split[5]), split[6], split.length ); } @@ -40,7 +40,7 @@ public class BedrockData { @Override public String toString() { - return version +'\0'+ username +'\0'+ bedrockId +'\0'+ deviceId +'\0'+ languageCode +'\0'+ + return version +'\0'+ username +'\0'+ xuid +'\0'+ deviceId +'\0'+ languageCode +'\0'+ inputMode +'\0'+ ip; } } diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java index b443f963..a2d8a726 100644 --- a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java +++ b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java @@ -221,7 +221,7 @@ public class GeyserSession implements CommandSender { encrypted = EncryptionUtil.encryptBedrockData(publicKey, new BedrockData( clientData.getGameVersion(), authData.getName(), - authData.getUUID(), + authData.getXboxUUID(), clientData.getDeviceOS().ordinal(), clientData.getLanguageCode(), clientData.getCurrentInputMode().ordinal(),