Include port in server address

Kas-tle · May 10, 2024 · 33583f7 · 33583f7
1 parent 46d566e
commit 33583f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/org/cloudburstmc/proxypass/network/bedrock/session/UpstreamPacketHandler.java b/src/main/java/org/cloudburstmc/proxypass/network/bedrock/session/UpstreamPacketHandler.java
@@ -200,7 +200,7 @@ private void initializeOnlineProxySession() {
             downstream.setPlayer(proxySession);
             this.session.setPlayer(proxySession);
 
-            String skinData = ForgeryUtils.forgeOnlineSkinData(account, this.skinData, this.proxy.getTargetAddress().getHostString());
+            String skinData = ForgeryUtils.forgeOnlineSkinData(account, this.skinData, this.proxy.getTargetAddress());
 
             try {
                 player.getLogger().saveJson("skinData", this.skinData);

diff --git a/src/main/java/org/cloudburstmc/proxypass/network/bedrock/util/ForgeryUtils.java b/src/main/java/org/cloudburstmc/proxypass/network/bedrock/util/ForgeryUtils.java
@@ -13,6 +13,7 @@
 import org.jose4j.jwx.HeaderParameterNames;
 import org.jose4j.lang.JoseException;
 
+import java.net.InetSocketAddress;
 import java.security.KeyFactory;
 import java.security.KeyPair;
 import java.security.interfaces.ECPublicKey;
@@ -104,15 +105,15 @@ public static String forgeOfflineSkinData(KeyPair pair, JSONObject skinData) {
     }
 
     @SuppressWarnings("unchecked")
-    public static String forgeOnlineSkinData(Account account, JSONObject skinData, String serverAddress) {
+    public static String forgeOnlineSkinData(Account account, JSONObject skinData, InetSocketAddress serverAddress) {
         String publicKeyBase64 = Base64.getEncoder().encodeToString(account.bedrockSession().getMcChain().getPublicKey().getEncoded());
 
         HashMap<String,Object> overrideData = new HashMap<String,Object>();
         overrideData.put("PlayFabId", account.bedrockSession().getPlayFabToken().getPlayFabId().toLowerCase(Locale.ROOT));
         overrideData.put("DeviceId", UUID.randomUUID().toString());
         overrideData.put("DeviceOS", 1); // Android per MinecraftAuth 4.0
         overrideData.put("ThirdPartyName", account.bedrockSession().getMcChain().getDisplayName());
-        overrideData.put("ServerAddress", serverAddress);
+        overrideData.put("ServerAddress", serverAddress.getHostString() + ":" + String.valueOf(serverAddress.getPort()));
 
         skinData.putAll(overrideData);