From d660c008ca9e4909942b228138fc01f6959e2fb3 Mon Sep 17 00:00:00 2001
From: SamB440 <sam@islandearth.net>
Date: Thu, 8 Jul 2021 20:35:23 +0100
Subject: [PATCH] Fix reload warning

---
 .../net/islandearth/rpgregions/RPGRegions.java   |  8 ++------
 .../listener/ServerReloadListener.java           | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 rpgregions/src/main/java/net/islandearth/rpgregions/listener/ServerReloadListener.java

diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java b/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java
index 276b879..d465558 100644
--- a/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java
+++ b/rpgregions/src/main/java/net/islandearth/rpgregions/RPGRegions.java
@@ -26,6 +26,7 @@ import net.islandearth.rpgregions.gson.PotionEffectAdapter;
 import net.islandearth.rpgregions.listener.ConnectionListener;
 import net.islandearth.rpgregions.listener.MoveListener;
 import net.islandearth.rpgregions.listener.RegionListener;
+import net.islandearth.rpgregions.listener.ServerReloadListener;
 import net.islandearth.rpgregions.managers.RPGRegionsManagers;
 import net.islandearth.rpgregions.managers.data.region.ConfiguredRegion;
 import net.islandearth.rpgregions.managers.registry.RPGRegionsRegistry;
@@ -90,12 +91,6 @@ public final class RPGRegions extends JavaPlugin implements IRPGRegionsAPI, Lang
 
 	@Override
 	public void onEnable() {
-		if (translator != null) {
-			getLogger().severe("RPGRegions does not support reloading. The plugin will now disable. Please use /rpgregions reload or restart your server instead.");
-			Bukkit.getPluginManager().disablePlugin(this);
-			return;
-		}
-
 		RPGRegionsAPI.setAPI(this);
 		this.createConfig();
 		this.generateLang();
@@ -242,6 +237,7 @@ public final class RPGRegions extends JavaPlugin implements IRPGRegionsAPI, Lang
 
 	private void registerListeners() {
 		PluginManager pm = Bukkit.getPluginManager();
+		pm.registerEvents(new ServerReloadListener(this), this);
 		pm.registerEvents(new ConnectionListener(this), this);
 		pm.registerEvents(new RegionListener(this), this);
 		pm.registerEvents(new MoveListener(this), this);
diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/listener/ServerReloadListener.java b/rpgregions/src/main/java/net/islandearth/rpgregions/listener/ServerReloadListener.java
new file mode 100644
index 0000000..1cfa62a
--- /dev/null
+++ b/rpgregions/src/main/java/net/islandearth/rpgregions/listener/ServerReloadListener.java
@@ -0,0 +1,16 @@
+package net.islandearth.rpgregions.listener;
+
+import net.islandearth.rpgregions.RPGRegions;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.ServerLoadEvent;
+
+public record ServerReloadListener(RPGRegions plugin) implements Listener {
+
+    @EventHandler
+    public void onLoad(ServerLoadEvent event) {
+        if (event.getType() == ServerLoadEvent.LoadType.RELOAD) {
+            plugin.getLogger().severe("RPGRegions does not support reloading. Please use /rpgregions reload or restart your server instead.");
+        }
+    }
+}