GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2026-01-04 15:31:48 +00:00
Code Issues Releases Activity

Allow the IP of the Bedrock client to be changed

Browse Source
This commit is contained in:
Tim203
2021-01-31 23:05:25 +01:00
parent 048cb6d1a1
commit 700b377e43
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/org/geysermc/floodgate/addon/data/HandshakeDataImpl.java
View File

@@ -47,6 +47,7 @@ public class HandshakeDataImpl implements HandshakeData {
@Setter private LinkedPlayer linkedPlayer;
@Setter private RawSkin rawSkin;
@Setter private String hostname;
@Setter private String bedrockIp;
@Setter private String disconnectReason;
public HandshakeDataImpl(
@@ -69,7 +70,6 @@ public class HandshakeDataImpl implements HandshakeData {
UUID javaUniqueId = null;
if (bedrockData != null) {
String prefix = config.getUsernamePrefix();
int usernameLength = Math.min(bedrockData.getUsername().length(), 16 - prefix.length());
javaUsername = prefix + bedrockData.getUsername().substring(0, usernameLength);
@@ -78,6 +78,7 @@ public class HandshakeDataImpl implements HandshakeData {
}
javaUniqueId = Utils.getJavaUuid(bedrockData.getXuid());
this.bedrockIp = bedrockData.getIp();
}
this.javaUsername = javaUsername;

2
common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
View File

@@ -149,7 +149,7 @@ public final class FloodgateHandshakeHandler {
channel.attr(playerAttribute).set(player);
int port = ((InetSocketAddress) channel.remoteAddress()).getPort();
InetSocketAddress socketAddress = new InetSocketAddress(bedrockData.getIp(), port);
InetSocketAddress socketAddress = new InetSocketAddress(handshakeData.getBedrockIp(), port);
player.addProperty(PropertyKey.SOCKET_ADDRESS, socketAddress);
return new HandshakeResult(ResultType.SUCCESS, handshakeData, bedrockData, player);