From 7907d579a3e5fcdb9a743d80ed854162712fa14a Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Sat, 28 Jan 2023 00:45:01 +0100
Subject: [PATCH] auto connect: fix version detection, resolve server address

---
 .../minosoft/protocol/packets/s2c/status/StatusS2CP.kt        | 2 +-
 src/main/java/de/bixilon/minosoft/terminal/AutoConnect.kt     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/StatusS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/StatusS2CP.kt
index b641a80be..409cbf33e 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/StatusS2CP.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/status/StatusS2CP.kt
@@ -33,7 +33,6 @@ class StatusS2CP(buffer: InByteBuffer) : StatusS2CPacket {
     val status: ServerStatus = ServerStatus(buffer.readJson())
 
     override fun handle(connection: StatusConnection) {
-        connection.status = status
         val version: Version? = Versions.getByProtocol(status.protocolId ?: -1)
         if (version == null) {
             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.status = status
         val ping = StatusPing()
         connection.ping = ping
         connection.state = StatusConnectionStates.QUERYING_PING
diff --git a/src/main/java/de/bixilon/minosoft/terminal/AutoConnect.kt b/src/main/java/de/bixilon/minosoft/terminal/AutoConnect.kt
index 9e74ad339..a21a1deaf 100644
--- a/src/main/java/de/bixilon/minosoft/terminal/AutoConnect.kt
+++ b/src/main/java/de/bixilon/minosoft/terminal/AutoConnect.kt
@@ -1,6 +1,6 @@
 /*
  * 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.
  *
@@ -69,6 +69,6 @@ object AutoConnect {
             return
         }
 
-        autoConnect(DNSUtil.getServerAddress(address), version, account)
+        autoConnect(DNSUtil.resolveServerAddress(address).first(), version, account)
     }
 }