From 4707ed1058a5bf0bf3eb97b9313fa7080ab3d6e2 Mon Sep 17 00:00:00 2001
From: Frank van der Heijden <frank.boekanier@gmail.com>
Date: Thu, 14 Oct 2021 15:57:10 +0200
Subject: [PATCH] Disable plugins before unloading :eyes:

---
 .../serverutils/common/entities/ServerUtilsPlugin.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/entities/ServerUtilsPlugin.java b/Common/src/main/java/net/frankheijden/serverutils/common/entities/ServerUtilsPlugin.java
index e72c993..0b6ee0e 100644
--- a/Common/src/main/java/net/frankheijden/serverutils/common/entities/ServerUtilsPlugin.java
+++ b/Common/src/main/java/net/frankheijden/serverutils/common/entities/ServerUtilsPlugin.java
@@ -20,6 +20,7 @@ import net.frankheijden.serverutils.common.config.ConfigResource;
 import net.frankheijden.serverutils.common.config.MessageKey;
 import net.frankheijden.serverutils.common.config.MessagesResource;
 import net.frankheijden.serverutils.common.entities.results.CloseablePluginResults;
+import net.frankheijden.serverutils.common.entities.results.PluginResults;
 import net.frankheijden.serverutils.common.managers.AbstractPluginManager;
 import net.frankheijden.serverutils.common.managers.AbstractTaskManager;
 import net.frankheijden.serverutils.common.managers.UpdateManager;
@@ -119,6 +120,12 @@ public abstract class ServerUtilsPlugin<P, T, C extends ServerUtilsAudience<S>,
 
         if (plugins.isEmpty()) return;
 
+        PluginResults<P> disableResults = getPluginManager().disablePlugins(plugins);
+        if (!disableResults.isSuccess()) {
+            disableResults.sendTo(getChatProvider().getConsoleServerAudience(), null);
+            return;
+        }
+
         CloseablePluginResults<P> unloadResults = getPluginManager().unloadPlugins(plugins);
         unloadResults.tryClose();
         unloadResults.sendTo(getChatProvider().getConsoleServerAudience(), MessageKey.UNLOADPLUGIN);