Fix brief shutdown hang in SubServers.Client

ME1312 · Apr 12, 2022 · 1521acf · 1521acf
1 parent ce262c6
commit 1521acf
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 19 deletions.
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java
@@ -110,7 +110,7 @@ public static void terminate(Process process) {
     private static boolean terminate9(Object handle) {
         try { // Attempt iteration over Java 9 ProcessHandle objects
             Class<?> clazz = handle.getClass();
-            Stream<?> children = (Stream<?>) clazz.getMethod("descendants").invoke(handle);
+            Stream<?> children = (Stream<?>) clazz.getMethod("children").invoke(handle);
             clazz.getMethod("destroyForcibly").invoke(handle);
             children.forEach(Executable::terminate9);
             return false;

diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java
@@ -182,16 +182,6 @@ public SubDataClient open(Consumer<Runnable> scheduler, Logger logger, InetAddre
         return subdata;
     }
 
-    @SuppressWarnings("deprecation")
-    @Override
-    public SubDataClient open(Logger logger, InetAddress address, int port) throws IOException {
-        SubPlugin plugin = SubAPI.getInstance().getInternals();
-        return open(event -> {
-            if (plugin.isEnabled()) Bukkit.getScheduler().runTaskAsynchronously(plugin, event);
-            else event.run();
-        }, logger, address, port);
-    }
-
     public SubDataClient open(InetAddress address, int port) throws IOException {
         return open(getLogger(0), address, port);
     }

diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java
@@ -195,13 +195,6 @@ public SubDataClient open(Consumer<Runnable> scheduler, Logger logger, InetAddre
         return subdata;
     }
 
-    @SuppressWarnings("deprecation")
-    @Override
-    public SubDataClient open(Logger logger, InetAddress address, int port) throws IOException {
-        SubPlugin plugin = SubAPI.getInstance().getInternals();
-        return open(event -> Sponge.getScheduler().createTaskBuilder().async().execute(event).submit(plugin), logger, address, port);
-    }
-
     public SubDataClient open(InetAddress address, int port) throws IOException {
         return open(getLogger(0), address, port);
     }

diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java
@@ -110,7 +110,7 @@ public static void terminate(Process process) {
     private static boolean terminate9(Object handle) {
         try { // Attempt iteration over Java 9 ProcessHandle objects
             Class<?> clazz = handle.getClass();
-            Stream<?> children = (Stream<?>) clazz.getMethod("descendants").invoke(handle);
+            Stream<?> children = (Stream<?>) clazz.getMethod("children").invoke(handle);
             clazz.getMethod("destroyForcibly").invoke(handle);
             children.forEach(Executable::terminate9);
             return false;