Fixed an issue with forwarding player links

bundabrg · Apr 3, 2021 · 21c8a38 · 21c8a38
1 parent 23c3db2
commit 21c8a38
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 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
@@ -101,9 +101,8 @@ public String toString() {
         // The format is the same as the order of the fields in this class
         return version + '\0' + username + '\0' + xuid + '\0' + deviceOs + '\0' +
                 languageCode + '\0' + uiProfile + '\0' + inputMode + '\0' + ip + '\0' +
-                (fromProxy ? 1 : 0) + '\0' +
                 (linkedPlayer != null ? linkedPlayer.toString() : "null") + '\0' +
-                subscribeId + '\0' + verifyCode + '\0' + timestamp;
+                (fromProxy ? 1 : 0) + '\0' + subscribeId + '\0' + verifyCode + '\0' + timestamp;
     }
 
     @Override

diff --git a/connector/src/main/java/org/geysermc/connector/skin/FloodgateSkinUploader.java b/connector/src/main/java/org/geysermc/connector/skin/FloodgateSkinUploader.java
@@ -39,6 +39,7 @@
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.handshake.ServerHandshake;
 
+import javax.net.ssl.SSLException;
 import java.net.ConnectException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -161,9 +162,13 @@ public void onClose(int code, String reason, boolean remote) {
 
             @Override
             public void onError(Exception ex) {
-                if (!(ex instanceof ConnectException)) {
-                    logger.error("Got an error", ex);
+                if (ex instanceof ConnectException || ex instanceof SSLException) {
+                    if (logger.isDebug()) {
+                        logger.error("[debug] Got an error", ex);
+                    }
+                    return;
                 }
+                logger.error("Got an error", ex);
             }
         };
     }