From 96658c1a4659e018baa012a10ca2d400d6ed1602 Mon Sep 17 00:00:00 2001 From: movte Date: Fri, 28 Aug 2026 16:03:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B8=B8=E6=88=8F=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=AF=94=E8=BE=83=E7=AE=97=E6=B3=95=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=AF=BC=E8=87=B4=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../version/installed/VersionComparator.kt | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/installed/VersionComparator.kt b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/installed/VersionComparator.kt index 751c24a8b0..22e9e0ede0 100644 --- a/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/installed/VersionComparator.kt +++ b/ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/version/installed/VersionComparator.kt @@ -30,22 +30,12 @@ object VersionComparator: Comparator { return if (pinned1) -1 else 1 } - val ver1 = o1.getVersionInfo()?.minecraftVersion - val ver2 = o2.getVersionInfo()?.minecraftVersion + val key1 = o1.getVersionInfo()?.minecraftVersion ?: o1.getVersionName() + val key2 = o2.getVersionInfo()?.minecraftVersion ?: o2.getVersionName() - if (ver1 != null && ver2 != null) { - val versionCompare = GameVersionNumber.compare(ver1, ver2) - if (versionCompare != 0) { - return -versionCompare - } - } - - val name1 = ver1 ?: o1.getVersionName() - val name2 = ver2 ?: o2.getVersionName() - - val nameCompare = naturalCompare(name1, name2) - if (nameCompare != 0) { - return nameCompare + val versionCompare = GameVersionNumber.compare(key1, key2) + if (versionCompare != 0) { + return -versionCompare } return naturalCompare(o1.getVersionName(), o2.getVersionName())