OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-11-21 22:36:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed an issue with forwarding player links

Browse source
This commit is contained in:
Tim203 2021-04-03 19:50:35 +02:00
parent 23c3db28ef
commit 21c8a389e3
No known key found for this signature in database
GPG key ID: 064EE9F5BF7C3EE8
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -101,9 +101,8 @@ public final class BedrockData implements Cloneable {
// 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

9
connector/src/main/java/org/geysermc/connector/skin/FloodgateSkinUploader.java
View file

@ -39,6 +39,7 @@ import org.geysermc.floodgate.util.WebsocketEventType;
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 final class FloodgateSkinUploader {
@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);
}
};
}