From 1afa28f67c59827ed37ace4ddb9d5015c95fda3e Mon Sep 17 00:00:00 2001
From: Frank van der Heijden <frank.boekanier@gmail.com>
Date: Tue, 2 Jun 2020 23:44:04 +0200
Subject: [PATCH] Add config for plugins command hijack

---
 .../frankheijden/serverutils/ServerUtils.java | 28 +++++++++++++++----
 src/main/resources/config.yml                 |  2 ++
 2 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/config.yml

diff --git a/src/main/java/net/frankheijden/serverutils/ServerUtils.java b/src/main/java/net/frankheijden/serverutils/ServerUtils.java
index c1fdd7b..124a008 100644
--- a/src/main/java/net/frankheijden/serverutils/ServerUtils.java
+++ b/src/main/java/net/frankheijden/serverutils/ServerUtils.java
@@ -7,11 +7,12 @@ import net.frankheijden.serverutils.config.Messenger;
 import net.frankheijden.serverutils.reflection.*;
 import org.bukkit.Bukkit;
 import org.bukkit.command.*;
+import org.bukkit.command.defaults.PluginsCommand;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -20,6 +21,7 @@ public class ServerUtils extends JavaPlugin implements CommandExecutor {
 
     private static ServerUtils instance;
     private PaperCommandManager commandManager;
+    private CommandPlugins commandPlugins;
 
     public static ServerUtils getInstance() {
         return instance;
@@ -30,11 +32,10 @@ public class ServerUtils extends JavaPlugin implements CommandExecutor {
         super.onEnable();
         instance = this;
 
-        this.removeCommands("pl", "plugins");
-
-        commandManager = new PaperCommandManager(this);
+        this.commandManager = new PaperCommandManager(this);
         commandManager.registerCommand(new CommandServerUtils());
-        commandManager.registerCommand(new CommandPlugins());
+        this.commandPlugins = null;
+
         commandManager.getCommandCompletions().registerAsyncCompletion("plugins", context -> Arrays.stream(Bukkit.getPluginManager().getPlugins())
                 .map(Plugin::getName)
                 .collect(Collectors.toList()));
@@ -48,6 +49,7 @@ public class ServerUtils extends JavaPlugin implements CommandExecutor {
     @Override
     public void onDisable() {
         super.onDisable();
+        restoreBukkitPluginCommand();
     }
 
     private void removeCommands(String... commands) {
@@ -64,8 +66,24 @@ public class ServerUtils extends JavaPlugin implements CommandExecutor {
         }
     }
 
+    public void restoreBukkitPluginCommand() {
+        RCraftServer.getCommandMap().register("bukkit", new PluginsCommand("plugins"));
+    }
+
     public void reload() {
+        if (commandPlugins != null) {
+            commandManager.unregisterCommand(commandPlugins);
+            restoreBukkitPluginCommand();
+        }
+
         new Messenger(copyResourceIfNotExists("messages.yml"));
+
+        YamlConfiguration config = YamlConfiguration.loadConfiguration(copyResourceIfNotExists("config.yml"));
+        if (!config.getBoolean("settings.disable-plugins-command", false)) {
+            this.removeCommands("pl", "plugins");
+            this.commandPlugins = new CommandPlugins();
+            commandManager.registerCommand(commandPlugins);
+        }
     }
 
     public PaperCommandManager getCommandManager() {
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
new file mode 100644
index 0000000..ba5ce43
--- /dev/null
+++ b/src/main/resources/config.yml
@@ -0,0 +1,2 @@
+settings:
+  disable-plugins-command: false
\ No newline at end of file