From f5ce9af3a8bfd6a83b0a8942e8f6f71cce035ddb Mon Sep 17 00:00:00 2001
From: Derongan <dgfried@gmail.com>
Date: Fri, 30 Jul 2021 23:18:54 -0700
Subject: [PATCH] Prevent reload from inadvertently closing the plugin class
 loader which causes config behaviour change between startup/reload.

When the plugin class loader is closed, calls to getResource will always return null. Because of this, the default config will always be null. If a section is left out of the config it is defaulted to the values in the default config. This means that if someone leaves out say the `blocks` section, startup will cause the blocks section to be populated with the blocks section from the default config. Reloading using `hiddenore` will then close the class loader, and when reading the config in a second time the defaults won't be applied leading to some very confusing behaviour.
---
 .../hiddenore/commands/CommandHandler.java         | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/github/devotedmc/hiddenore/commands/CommandHandler.java b/src/main/java/com/github/devotedmc/hiddenore/commands/CommandHandler.java
index 315f161..71e17c4 100644
--- a/src/main/java/com/github/devotedmc/hiddenore/commands/CommandHandler.java
+++ b/src/main/java/com/github/devotedmc/hiddenore/commands/CommandHandler.java
@@ -1,9 +1,13 @@
 package com.github.devotedmc.hiddenore.commands;
 
+import com.github.devotedmc.hiddenore.BlockConfig;
+import com.github.devotedmc.hiddenore.Config;
+import com.github.devotedmc.hiddenore.DropConfig;
+import com.github.devotedmc.hiddenore.DropItemConfig;
+import com.github.devotedmc.hiddenore.HiddenOre;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
 import org.bukkit.command.Command;
@@ -12,12 +16,6 @@
 import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
 
-import com.github.devotedmc.hiddenore.BlockConfig;
-import com.github.devotedmc.hiddenore.Config;
-import com.github.devotedmc.hiddenore.DropConfig;
-import com.github.devotedmc.hiddenore.DropItemConfig;
-import com.github.devotedmc.hiddenore.HiddenOre;
-
 /**
  * Management and maintenance commands
  * 
@@ -93,7 +91,7 @@ public void run() {
 						return true;
 					}
 				} else {
-					Bukkit.getPluginManager().disablePlugin(plugin);
+					Bukkit.getPluginManager().disablePlugin(plugin, false);
 					Bukkit.getPluginManager().enablePlugin(plugin);
 					sender.sendMessage("HiddenOre reloaded");
 					return true;