Post shutdown fixes

src/main/java/com/volmit/iris/Iris.java

@@ -75,7 +75,6 @@ import java.util.Map;
 @SuppressWarnings("CanBeFinal")
 public class Iris extends VolmitPlugin implements Listener {
     private KMap<Class<? extends IrisService>, IrisService> services;
-    public static KList<GroupedExecutor> executors = new KList<>();
     public static Iris instance;
     public static BukkitAudiences audiences;
     public static MultiverseCoreLink linkMultiverseCore;
@@ -85,6 +84,7 @@ public class Iris extends VolmitPlugin implements Listener {
     public static IrisCompat compat;
     public static FileWatcher configWatcher;
     private static VolmitSender sender;
+    private final KList<Runnable> postShutdown = new KList<>();
 
     @Permission
     public static PermissionIris perm;
@@ -126,6 +126,11 @@ public class Iris extends VolmitPlugin implements Listener {
         services.values().forEach(this::registerListener);
     }
 
+    public void postShutdown(Runnable r)
+    {
+        postShutdown.add(r);
+    }
+
     private void postEnable() {
         J.a(() -> PaperLib.suggestPaper(this));
         J.a(() -> IO.delete(getTemp()));
@@ -155,18 +160,10 @@ public class Iris extends VolmitPlugin implements Listener {
     }
 
     public void onDisable() {
-        for (GroupedExecutor i : executors) {
+        services.values().forEach(IrisService::onDisable);
-            Iris.debug("Closing Executor " + i.toString());
-            i.closeNow();
-        }
-
-        executors.clear();
-
         Bukkit.getScheduler().cancelTasks(this);
         HandlerList.unregisterAll((Plugin) this);
-        MultiBurst.burst.shutdown();
+        postShutdown.forEach(Runnable::run);
-
-        services.values().forEach(IrisService::onDisable);
         services.clear();
         super.onDisable();
     }

src/main/java/com/volmit/iris/util/parallel/MultiBurst.java

@@ -159,6 +159,8 @@ public class MultiBurst {
 
     public void shutdownLater() {
         if (service != null) {
+            try
+            {
                 service.submit(() -> {
                     J.sleep(3000);
                     Iris.debug("Shutting down MultiBurst Pool " + heartbeat.getName() + ".");
@@ -170,6 +172,18 @@ public class MultiBurst {
 
                 heartbeat.interrupt();
             }
+
+            catch(Throwable e)
+            {
+                Iris.debug("Shutting down MultiBurst Pool " + heartbeat.getName() + ".");
+
+                if (service != null) {
+                    service.shutdown();
+                }
+
+                heartbeat.interrupt();
+            }
+        }
     }
 
     public void shutdownAndAwait() {

src/main/java/com/volmit/iris/util/plugin/IrisService.java

@@ -18,10 +18,16 @@
 
 package com.volmit.iris.util.plugin;
 
+import com.volmit.iris.Iris;
 import org.bukkit.event.Listener;
 
 public interface IrisService extends Listener {
     void onEnable();
 
     void onDisable();
+
+    default void postShutdown(Runnable r)
+    {
+        Iris.instance.postShutdown(r);
+    }
 }