Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-02 23:20:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #384 from xCykrix/1.15

Browse Source 
Correct JVM Architecture Detection
This commit is contained in:
Josh Knight 2020-03-29 19:33:37 -04:00 committed by GitHub
commit 5f3d6cdc79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
worldedit-core/src/main/java/com/boydti/fawe/Fawe.java
View File

@ -353,10 +353,10 @@ public class Fawe {
debug("===============================================");
}
}
String arch = System.getenv("PROCESSOR_ARCHITECTURE");
String wow64Arch = System.getenv("PROCESSOR_ARCHITEW6432");
boolean x86OS = arch == null ? true : !(arch.endsWith("64") || wow64Arch != null && wow64Arch.endsWith("64"));
boolean x86JVM = System.getProperty("sun.arch.data.model").equals("32");
// Check Base OS Arch for Mismatching Architectures
boolean x86OS = System.getProperty("sun.arch.data.model").contains("32");
boolean x86JVM = System.getProperty("os.arch").contains("32");
if (x86OS != x86JVM) {
debug("====== UPGRADE TO 64-BIT JAVA ======");
debug("You are running 32-bit Java on a 64-bit machine");