From 1521acfc519f41f820f3c62f6aafc73719744fcf Mon Sep 17 00:00:00 2001
From: ME1312 <admin@me1312.net>
Date: Tue, 12 Apr 2022 07:59:33 -0400
Subject: [PATCH] Fix brief shutdown hang in SubServers.Client

---
 .../net/ME1312/SubServers/Bungee/Host/Executable.java  |  2 +-
 .../SubServers/Client/Bukkit/Network/SubProtocol.java  | 10 ----------
 .../SubServers/Client/Sponge/Network/SubProtocol.java  |  7 -------
 .../ME1312/SubServers/Host/Executable/Executable.java  |  2 +-
 4 files changed, 2 insertions(+), 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
index 91eeac3b..6b365bfc 100644
--- 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 class Executable {
     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
index 9a815c94..5c88f139 100644
--- 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 class SubProtocol extends SubDataProtocol {
         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
index 68297a70..a48cefff 100644
--- 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 class SubProtocol extends SubDataProtocol {
         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
index 9be2eb08..b393991d 100644
--- 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 class Executable {
     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;