From 587c27dc5f94122e61ab6394919417942cf60d05 Mon Sep 17 00:00:00 2001
From: SuperRonanCraft <SuperRonanCraft@gmail.com>
Date: Thu, 21 Jan 2021 11:54:26 -0500
Subject: [PATCH] Addons - Commands added - release 1.3

---
 BetterRTPAddons/pom.xml                                |  2 +-
 .../BetterRTPAddons/addons/commands/AddonCommands.java |  2 +-
 .../addons/commands/CommandsLoader.java                | 10 +++++++++-
 BetterRTPAddons/src/main/resources/plugin.yml          |  2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/BetterRTPAddons/pom.xml b/BetterRTPAddons/pom.xml
index a8cef44..0f782d4 100644
--- a/BetterRTPAddons/pom.xml
+++ b/BetterRTPAddons/pom.xml
@@ -7,7 +7,7 @@
     <groupId>me.SuperRonanCraft</groupId>
     <artifactId>BetterRTPAddons</artifactId>
     <packaging>jar</packaging>
-    <version>1.2</version>
+    <version>1.3</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/commands/AddonCommands.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/commands/AddonCommands.java
index 3c28a50..887d61f 100644
--- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/commands/AddonCommands.java
+++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/commands/AddonCommands.java
@@ -20,6 +20,6 @@ public class AddonCommands implements Addon {
 
     @Override
     public void unload() {
-
+        loader.unload();
     }
 }
diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/commands/CommandsLoader.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/commands/CommandsLoader.java
index 6089e50..7c3b504 100644
--- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/commands/CommandsLoader.java
+++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/commands/CommandsLoader.java
@@ -6,6 +6,8 @@ import me.SuperRonanCraft.BetterRTPAddons.Main;
 import me.SuperRonanCraft.BetterRTPAddons.util.Files;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 
 import java.util.HashMap;
@@ -20,7 +22,7 @@ public class CommandsLoader implements Listener {
         String name = "Commands";
         commands.clear();
         for (Command_types type : Command_types.values()) {
-            String path = name + "." + type.path;
+            String path = name + ".Events." + type.path;
             if (file.getBoolean(path + ".Enabled")) {
                 List<String> cmds = file.getStringList(path + ".Commands");
                 commands.put(type, cmds);
@@ -29,16 +31,22 @@ public class CommandsLoader implements Listener {
         Bukkit.getPluginManager().registerEvents(this, Main.getInstance());
     }
 
+    void unload() {
+        HandlerList.unregisterAll(this);
+    }
+
     private Files.FILETYPE getFile() {
         return Main.getInstance().getFiles().getType(Files.FILETYPE.CONFIG);
     }
 
     //Events
+    @EventHandler
     public void eventTeleport(RTP_TeleportEvent event) {
         if (!commands.containsKey(Command_types.TELEPORT)) return;
         executeCommands(commands.get(Command_types.TELEPORT), event.getPlayer());
     }
 
+    @EventHandler
     public void eventCancelled(RTP_CancelledEvent event) {
         if (!commands.containsKey(Command_types.CANCELLED)) return;
         executeCommands(commands.get(Command_types.CANCELLED), event.getPlayer());
diff --git a/BetterRTPAddons/src/main/resources/plugin.yml b/BetterRTPAddons/src/main/resources/plugin.yml
index 218e146..fcfa8de 100644
--- a/BetterRTPAddons/src/main/resources/plugin.yml
+++ b/BetterRTPAddons/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 main: me.SuperRonanCraft.BetterRTPAddons.Main
-version: 1.2
+version: 1.3
 api-version: '1.13'
 name: BetterRTPAddons
 depend: [BetterRTP]