From 4ba0489d9d8a53bcce10d36ca4f7abaa788f0d7a Mon Sep 17 00:00:00 2001 From: ME1312 Date: Sun, 16 Feb 2020 15:01:17 -0500 Subject: [PATCH] Bypass new Oracle argument restrictions --- SubServers.Bungee/pom.xml | 4 ++-- .../src/net/ME1312/SubServers/Bungee/Launch.java | 1 + .../src/net/ME1312/SubServers/Bungee/SubProxy.java | 2 +- SubServers.Client/Bukkit/pom.xml | 2 +- SubServers.Client/Sponge/pom.xml | 2 +- SubServers.Host/pom.xml | 2 +- SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java | 1 + SubServers.Sync/pom.xml | 4 ++-- SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml index cb6b6c3f..f5006c5b 100644 --- a/SubServers.Bungee/pom.xml +++ b/SubServers.Bungee/pom.xml @@ -30,14 +30,14 @@ net.ME1312.Galaxi GalaxiUtil - 20w04c + 20w08a compile true net.ME1312.Galaxi GalaxiEngine - 20w04c + 20w08a provided diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java index 34a5716b..bd280d04 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java @@ -23,6 +23,7 @@ public final class Launch { */ @SuppressWarnings({"deprecation", "unchecked"}) public static void main(String[] args) throws Exception { + System.setProperty("jdk.lang.Process.allowAmbiguousCommands", "true"); System.setProperty("apple.laf.useScreenMenuBar", "true"); if (Util.getDespiteException(() -> Class.forName("net.md_5.bungee.BungeeCord") == null, true)) { diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java index a5cd8bd2..53549151 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java @@ -822,7 +822,7 @@ public final class SubProxy extends BungeeCord implements Listener { for (String name : e.getConnection().getListener().getServerPriority()) { ServerInfo server = api.getServer(name.toLowerCase()); if (server == null) server = getServerInfo(name); - if (server == null || server instanceof SubServer && !((SubServer) server).isRunning()) offline++; + if (server == null || (server instanceof SubServer && !((SubServer) server).isRunning())) offline++; } if (offline >= e.getConnection().getListener().getServerPriority().size()) { diff --git a/SubServers.Client/Bukkit/pom.xml b/SubServers.Client/Bukkit/pom.xml index 3f0dd015..f6dd5d9c 100644 --- a/SubServers.Client/Bukkit/pom.xml +++ b/SubServers.Client/Bukkit/pom.xml @@ -48,7 +48,7 @@ net.ME1312.Galaxi GalaxiUtil - 20w04c + 20w08a compile true diff --git a/SubServers.Client/Sponge/pom.xml b/SubServers.Client/Sponge/pom.xml index 45094222..53b280fa 100644 --- a/SubServers.Client/Sponge/pom.xml +++ b/SubServers.Client/Sponge/pom.xml @@ -30,7 +30,7 @@ net.ME1312.Galaxi GalaxiUtil - 20w04c + 20w08a compile true diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml index 2c1aa138..d178a02c 100644 --- a/SubServers.Host/pom.xml +++ b/SubServers.Host/pom.xml @@ -20,7 +20,7 @@ net.ME1312.Galaxi GalaxiEngine - 20w04c + 20w08a compile true diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java index ee0aaf20..451cadd4 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java @@ -12,6 +12,7 @@ public final class Launch { * @throws Exception */ public static void main(String[] args) throws Exception { + System.setProperty("jdk.lang.Process.allowAmbiguousCommands", "true"); System.setProperty("apple.laf.useScreenMenuBar", "true"); boolean exists = false; try { diff --git a/SubServers.Sync/pom.xml b/SubServers.Sync/pom.xml index f7bb68d8..8390e7da 100644 --- a/SubServers.Sync/pom.xml +++ b/SubServers.Sync/pom.xml @@ -30,14 +30,14 @@ net.ME1312.Galaxi GalaxiUtil - 20w04c + 20w08a compile true net.ME1312.Galaxi GalaxiEngine - 20w04c + 20w08a provided diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java index 23b32745..cc2460ce 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java @@ -330,7 +330,7 @@ public final class ExProxy extends BungeeCord implements Listener { int offline = 0; for (String name : e.getConnection().getListener().getServerPriority()) { ServerInfo server = getServerInfo(name); - if (server == null || server instanceof SubServerImpl && !((SubServerImpl) server).isRunning()) offline++; + if (server == null || (server instanceof SubServerImpl && !((SubServerImpl) server).isRunning())) offline++; } if (offline >= e.getConnection().getListener().getServerPriority().size()) {