From e76d520cac7ce59ccbacb87edf8d61d6749529eb Mon Sep 17 00:00:00 2001
From: Glavo <zjx001202@gmail.com>
Date: Mon, 6 Feb 2023 22:49:37 +0800
Subject: [PATCH] =?UTF-8?q?x86-64=20=E5=B9=B3=E5=8F=B0=E4=B8=8A=E4=B8=8D?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=80=89=E6=8B=A9=2032=20=E4=BD=8D=20Java=20?=
 =?UTF-8?q?(#2042)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* close #2041

* update

* update
---
 .../java/org/jackhuang/hmcl/game/JavaVersionConstraint.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java
index 7262beb90..f2e1444c1 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java
@@ -252,6 +252,10 @@ public enum JavaVersionConstraint {
         JavaVersion mandatory = null;
         JavaVersion suggested = null;
         for (JavaVersion javaVersion : JavaVersion.getJavas()) {
+            // Do not automatically select 32-bit Java
+            if (Architecture.SYSTEM_ARCH == Architecture.X86_64 && javaVersion.getArchitecture() == Architecture.X86)
+                continue;
+
             // select the latest x86 java that this version accepts.
             if (forceX86 && !javaVersion.getArchitecture().isX86())
                 continue;