From dd99bad81c7bc97894a40c144ebe935ec65c3a75 Mon Sep 17 00:00:00 2001
From: Frank van der Heijden <frank.boekanier@gmail.com>
Date: Tue, 3 Aug 2021 20:07:50 +0200
Subject: [PATCH] Bungee can't differentiate between loaded and enabled

---
 .../bungee/managers/BungeePluginManager.java  |  7 ++++-
 .../managers/AbstractPluginManager.java       | 28 +++++++++++++------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/Bungee/src/main/java/net/frankheijden/serverutils/bungee/managers/BungeePluginManager.java b/Bungee/src/main/java/net/frankheijden/serverutils/bungee/managers/BungeePluginManager.java
index 00cf68f..b57726f 100644
--- a/Bungee/src/main/java/net/frankheijden/serverutils/bungee/managers/BungeePluginManager.java
+++ b/Bungee/src/main/java/net/frankheijden/serverutils/bungee/managers/BungeePluginManager.java
@@ -124,7 +124,12 @@ public class BungeePluginManager extends AbstractPluginManager<Plugin, BungeePlu
 
     @Override
     public boolean isPluginEnabled(String pluginId) {
-        return false; // Not supported on BungeeCord.
+        return getPlugin(pluginId).isPresent();
+    }
+
+    @Override
+    protected Optional<Plugin> checkPluginStates(List<Plugin> plugins, boolean enabled) {
+        return Optional.empty(); // Bungee can't differentiate between "loaded" and "enabled"
     }
 
     @Override
diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/managers/AbstractPluginManager.java b/Common/src/main/java/net/frankheijden/serverutils/common/managers/AbstractPluginManager.java
index c5ef500..bbdd06a 100644
--- a/Common/src/main/java/net/frankheijden/serverutils/common/managers/AbstractPluginManager.java
+++ b/Common/src/main/java/net/frankheijden/serverutils/common/managers/AbstractPluginManager.java
@@ -97,11 +97,9 @@ public abstract class AbstractPluginManager<P, D extends ServerUtilsPluginDescri
      * Enables a list of plugins.
      */
     public PluginResults<P> enablePlugins(List<P> plugins) {
-        for (P plugin : plugins) {
-            String pluginId = getPluginId(plugin);
-            if (isPluginEnabled(pluginId)) {
-                return new PluginResults<P>().addResult(pluginId, Result.ALREADY_ENABLED);
-            }
+        Optional<P> pluginOptional = checkPluginStates(plugins, false);
+        if (pluginOptional.isPresent()) {
+            return new PluginResults<P>().addResult(getPluginId(pluginOptional.get()), Result.ALREADY_ENABLED);
         }
 
         return enableOrderedPlugins(determineLoadOrder(plugins));
@@ -115,6 +113,19 @@ public abstract class AbstractPluginManager<P, D extends ServerUtilsPluginDescri
 
     public abstract boolean isPluginEnabled(String pluginId);
 
+    /**
+     * Finds the first plugin where the enabled state does not match the given state it must be in.
+     * This method can be overridden by implementations which don't support the enabled state.
+     */
+    protected Optional<P> checkPluginStates(List<P> plugins, boolean enabled) {
+        for (P plugin : plugins) {
+            if (isPluginEnabled(plugin) != enabled) {
+                return Optional.of(plugin);
+            }
+        }
+        return Optional.empty();
+    }
+
     /**
      * Disables the given plugin by name.
      */
@@ -132,10 +143,9 @@ public abstract class AbstractPluginManager<P, D extends ServerUtilsPluginDescri
      * Disables a list of plugins.
      */
     public PluginResults<P> disablePlugins(List<P> plugins) {
-        for (P plugin : plugins) {
-            if (!isPluginEnabled(plugin)) {
-                return new PluginResults<P>().addResult(getPluginId(plugin), Result.ALREADY_DISABLED);
-            }
+        Optional<P> pluginOptional = checkPluginStates(plugins, true);
+        if (pluginOptional.isPresent()) {
+            return new PluginResults<P>().addResult(getPluginId(pluginOptional.get()), Result.ALREADY_DISABLED);
         }
 
         List<P> orderedPlugins;