Upstream/SubServers-2
1
0
Fork 0
mirror of https://github.com/ME1312/SubServers-2.git synced 2024-11-22 02:08:27 +01:00
Code Issues Projects Releases Wiki Activity

Fix brief shutdown hang in SubServers.Client

Browse Source
This commit is contained in:
ME1312 2022-04-12 07:59:33 -04:00
parent ce262c62f0
commit 1521acfc51
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
4 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java
View File

@ -110,7 +110,7 @@ public class Executable {
private static boolean terminate9(Object handle) { private static boolean terminate9(Object handle) {
try { // Attempt iteration over Java 9 ProcessHandle objects try { // Attempt iteration over Java 9 ProcessHandle objects
Class<?> clazz = handle.getClass(); 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); clazz.getMethod("destroyForcibly").invoke(handle);
children.forEach(Executable::terminate9); children.forEach(Executable::terminate9);
return false; return false;

10
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java
View File

@ -182,16 +182,6 @@ public class SubProtocol extends SubDataProtocol {
return subdata; 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 { public SubDataClient open(InetAddress address, int port) throws IOException {
return open(getLogger(0), address, port); return open(getLogger(0), address, port);
} }

7
SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java
View File

@ -195,13 +195,6 @@ public class SubProtocol extends SubDataProtocol {
return subdata; 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 { public SubDataClient open(InetAddress address, int port) throws IOException {
return open(getLogger(0), address, port); return open(getLogger(0), address, port);
} }

2
SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java
View File

@ -110,7 +110,7 @@ public class Executable {
private static boolean terminate9(Object handle) { private static boolean terminate9(Object handle) {
try { // Attempt iteration over Java 9 ProcessHandle objects try { // Attempt iteration over Java 9 ProcessHandle objects
Class<?> clazz = handle.getClass(); 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); clazz.getMethod("destroyForcibly").invoke(handle);
children.forEach(Executable::terminate9); children.forEach(Executable::terminate9);
return false; return false;