Google/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
RednedEpic 2020-03-10 18:41:22 -05:00
commit 49182da578
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/src/main/java/org/geysermc/floodgate/util/BedrockData.java
View file

@ -3,6 +3,8 @@ package org.geysermc.floodgate.util;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import java.util.UUID;
@AllArgsConstructor @AllArgsConstructor
@Getter @Getter
public class BedrockData { public class BedrockData {
@ -11,15 +13,15 @@ public class BedrockData {
private String version; private String version;
private String username; private String username;
private String xuid; private UUID bedrockId;
private int deviceId; private int deviceId;
private String languageCode; private String languageCode;
private int inputMode; private int inputMode;
private String ip; private String ip;
private int dataLength; private int dataLength;
public BedrockData(String version, String username, String xuid, int deviceId, String languageCode, int inputMode, String ip) { public BedrockData(String version, String username, UUID bedrockId, int deviceId, String languageCode, int inputMode, String ip) {
this(version, username, xuid, deviceId, languageCode, inputMode, ip, EXPECTED_LENGTH); this(version, username, bedrockId, deviceId, languageCode, inputMode, ip, EXPECTED_LENGTH);
} }
public static BedrockData fromString(String data) { public static BedrockData fromString(String data) {
@ -27,7 +29,7 @@ public class BedrockData {
if (split.length != EXPECTED_LENGTH) return null; if (split.length != EXPECTED_LENGTH) return null;
return new BedrockData( return new BedrockData(
split[0], split[1], split[2], Integer.parseInt(split[3]), split[0], split[1], UUID.fromString(split[2]), Integer.parseInt(split[3]),
split[4], Integer.parseInt(split[5]), split[6], split.length split[4], Integer.parseInt(split[5]), split[6], split.length
); );
} }
@ -38,7 +40,7 @@ public class BedrockData {
@Override @Override
public String toString() { public String toString() {
return version +'\0'+ username +'\0'+ xuid +'\0'+ deviceId +'\0'+ languageCode +'\0'+ return version +'\0'+ username +'\0'+ bedrockId +'\0'+ deviceId +'\0'+ languageCode +'\0'+
inputMode +'\0'+ ip; inputMode +'\0'+ ip;
} }
} }

2
connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
View file

@ -221,7 +221,7 @@ public class GeyserSession implements CommandSender {
encrypted = EncryptionUtil.encryptBedrockData(publicKey, new BedrockData( encrypted = EncryptionUtil.encryptBedrockData(publicKey, new BedrockData(
clientData.getGameVersion(), clientData.getGameVersion(),
authData.getName(), authData.getName(),
authData.getXboxUUID(), authData.getUUID(),
clientData.getDeviceOS().ordinal(), clientData.getDeviceOS().ordinal(),
clientData.getLanguageCode(), clientData.getLanguageCode(),
clientData.getCurrentInputMode().ordinal(), clientData.getCurrentInputMode().ordinal(),