AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-19 04:15:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some issues with connecting to a server with a forced version

Browse Source
This commit is contained in:
Bixilon 2020-08-26 20:58:49 +02:00
parent eb2c1eff63
commit 35ae072d79
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java
View File

@ -102,7 +102,7 @@ public class ServerListCell extends ListCell<Server> implements Initializable {
icon.setImage(favicon); icon.setImage(favicon);
optionsConnect.setOnAction(e -> { optionsConnect.setOnAction(e -> {
Connection connection = new Connection(Connection.lastConnectionId++, server.getAddress(), new Player(Minosoft.accountList.get(0))); Connection connection = new Connection(Connection.lastConnectionId++, server.getAddress(), new Player(Minosoft.accountList.get(0)));
connection.resolve(ConnectionReasons.CONNECT); connection.resolve(ConnectionReasons.CONNECT, server.getDesiredVersion());
}); });
optionsEdit.setOnAction(e -> edit()); optionsEdit.setOnAction(e -> edit());

9
src/main/java/de/bixilon/minosoft/protocol/network/Connection.java
View File

@ -82,13 +82,20 @@ public class Connection {
network.connect(address); network.connect(address);
} }
public void resolve(ConnectionReasons reason) { public void resolve(ConnectionReasons reason, int protocolId) {
address = addresses.get(0); address = addresses.get(0);
this.nextReason = reason; this.nextReason = reason;
Log.info(String.format("Trying to connect to %s", address)); Log.info(String.format("Trying to connect to %s", address));
if (protocolId != -1) {
setVersion(Versions.getVersionById(protocolId));
}
resolve(address); resolve(address);
} }
public void resolve(ConnectionReasons reason) {
resolve(reason, -1);
}
public void resolve(ServerAddress address) { public void resolve(ServerAddress address) {
reason = ConnectionReasons.DNS; reason = ConnectionReasons.DNS;
network.connect(address); network.connect(address);

2
src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.java
View File

@ -385,7 +385,7 @@ public class InByteBuffer {
public EntityMetaData.MetaDataHashMap readMetaData() { public EntityMetaData.MetaDataHashMap readMetaData() {
EntityMetaData.MetaDataHashMap sets = new EntityMetaData.MetaDataHashMap(); EntityMetaData.MetaDataHashMap sets = new EntityMetaData.MetaDataHashMap();
if (protocolId < 47) { if (protocolId < 48) {
byte item = readByte(); byte item = readByte();
while (item != 0x7F) { while (item != 0x7F) {