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

auto connect: fix version detection, resolve server address

Browse Source
This commit is contained in:
Bixilon 2023-01-28 00:45:01 +01:00
parent 7ff18cce79
commit 7907d579a3
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 3 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/protocol/packets/s2c/status/StatusS2CP.kt
View File

@ -33,7 +33,6 @@ class StatusS2CP(buffer: InByteBuffer) : StatusS2CPacket {
val status: ServerStatus = ServerStatus(buffer.readJson()) val status: ServerStatus = ServerStatus(buffer.readJson())
override fun handle(connection: StatusConnection) { override fun handle(connection: StatusConnection) {
connection.status = status
val version: Version? = Versions.getByProtocol(status.protocolId ?: -1) val version: Version? = Versions.getByProtocol(status.protocolId ?: -1)
if (version == null) { if (version == null) {
Log.log(LogMessageType.NETWORK_STATUS, LogLevels.WARN) { "Server is running on unknown version (protocolId=${status.protocolId})" } Log.log(LogMessageType.NETWORK_STATUS, LogLevels.WARN) { "Server is running on unknown version (protocolId=${status.protocolId})" }
@ -41,6 +40,7 @@ class StatusS2CP(buffer: InByteBuffer) : StatusS2CPacket {
connection.serverVersion = version connection.serverVersion = version
} }
connection.status = status
val ping = StatusPing() val ping = StatusPing()
connection.ping = ping connection.ping = ping
connection.state = StatusConnectionStates.QUERYING_PING connection.state = StatusConnectionStates.QUERYING_PING

4
src/main/java/de/bixilon/minosoft/terminal/AutoConnect.kt
View File

@ -1,6 +1,6 @@
/* /*
* Minosoft * Minosoft
* Copyright (C) 2020-2022 Moritz Zwerger * Copyright (C) 2020-2023 Moritz Zwerger
* *
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* *
@ -69,6 +69,6 @@ object AutoConnect {
return return
} }
autoConnect(DNSUtil.getServerAddress(address), version, account) autoConnect(DNSUtil.resolveServerAddress(address).first(), version, account)
} }
} }