From f10407b5ea1cbf16b48236f34ee9e4886ceabc8f Mon Sep 17 00:00:00 2001
From: Frank van der Heijden <frank.boekanier@gmail.com>
Date: Wed, 21 Jul 2021 03:07:23 +0200
Subject: [PATCH] Return correct result if plugin is already loaded/enabled

---
 .../serverutils/velocity/managers/VelocityPluginManager.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginManager.java b/Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginManager.java
index 813cc87..c1a7288 100644
--- a/Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginManager.java
+++ b/Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginManager.java
@@ -64,6 +64,7 @@ public class VelocityPluginManager extends AbstractPluginManager<PluginContainer
 
         Object javaPluginLoader = RJavaPluginLoader.newInstance(proxy, file.toPath().getParent());
         PluginDescription candidate = RJavaPluginLoader.loadPluginDescription(javaPluginLoader, file.toPath());
+        if (proxy.getPluginManager().isLoaded(candidate.getId())) return new VelocityLoadResult(Result.ALREADY_LOADED);
 
         for (PluginDependency dependency : candidate.getDependencies()) {
             if (!dependency.isOptional() && !proxy.getPluginManager().isLoaded(dependency.getId())) {
@@ -84,6 +85,8 @@ public class VelocityPluginManager extends AbstractPluginManager<PluginContainer
 
     @Override
     public Result enablePlugin(PluginContainer container) {
+        if (proxy.getPluginManager().isLoaded(container.getDescription().getId())) return Result.ALREADY_ENABLED;
+
         Object javaPluginLoader = RJavaPluginLoader.newInstance(
                 proxy,
                 container.getDescription().getSource().map(Path::getParent).orElse(null)