From b3eb0ebb9805eb31771600f3c374c2b391bd6cad Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Sun, 7 Jan 2024 20:18:15 +0700
Subject: [PATCH] [FIX] Support arch i586 in release file

---
 .../src/main/java/pro/gravit/utils/helper/JVMHelper.java        | 2 +-
 .../src/main/java/pro/gravit/utils/helper/JavaHelper.java       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/LauncherCore/src/main/java/pro/gravit/utils/helper/JVMHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/JVMHelper.java
index a7cdb354..ba1bbf85 100644
--- a/LauncherCore/src/main/java/pro/gravit/utils/helper/JVMHelper.java
+++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/JVMHelper.java
@@ -46,7 +46,7 @@ private JVMHelper() {
 
     public static ARCH getArch(String arch) {
         if (arch.equals("amd64") || arch.equals("x86-64") || arch.equals("x86_64")) return ARCH.X86_64;
-        if (arch.equals("i386") || arch.equals("i686") || arch.equals("x86")) return ARCH.X86;
+        if (arch.equals("i386") || arch.equals("i586") || arch.equals("i686") || arch.equals("x86")) return ARCH.X86;
         if (arch.startsWith("armv8") || arch.startsWith("aarch64")) return ARCH.ARM64;
         if (arch.startsWith("arm") || arch.startsWith("aarch32")) return ARCH.ARM32;
         throw new InternalError(String.format("Unsupported arch '%s'", arch));
diff --git a/LauncherCore/src/main/java/pro/gravit/utils/helper/JavaHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/JavaHelper.java
index 2bfb54cf..e73cec59 100644
--- a/LauncherCore/src/main/java/pro/gravit/utils/helper/JavaHelper.java
+++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/JavaHelper.java
@@ -257,7 +257,6 @@ public static JavaVersion getByPath(Path jvmDir) {
                             arch = JVMHelper.getArch(archProperty);
                         }
                     } catch (Throwable ignored) {
-                        arch = null;
                     }
                     String modulesProperty = getProperty(properties, "MODULES");
                     if(modulesProperty != null) {