From 82ff7cfa73bf320ac0b2393db225d62b42256f7a Mon Sep 17 00:00:00 2001
From: Lennart ten Wolde <lenny.devmail@gmail.com>
Date: Fri, 28 Jul 2017 23:29:19 +0200
Subject: [PATCH] Resolve command registration (for some users)

---
 .../lenis0012/bukkit/marriage2/Marriage.java  |  3 +-
 .../marriage2/internal/MarriageBase.java      |  5 +++-
 .../marriage2/internal/MarriageCore.java      | 28 ++++++++++++++++---
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/Marriage.java b/src/main/java/com/lenis0012/bukkit/marriage2/Marriage.java
index 66cc7bb..303e580 100644
--- a/src/main/java/com/lenis0012/bukkit/marriage2/Marriage.java
+++ b/src/main/java/com/lenis0012/bukkit/marriage2/Marriage.java
@@ -77,8 +77,9 @@ public interface Marriage {
      * Register a subcommand to the /marry command.
      *
      * @param commandClass Class of the sub command to be registered.
+     * @param commandClasses Additional command classes
      */
-    void register(Class<? extends Command> commandClass);
+    void register(Class<? extends Command> commandClass, Class<? extends Command>... commandClasses);
 
     /**
      * Get the plugin logger instance.
diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageBase.java b/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageBase.java
index 4c4171d..f21c7be 100644
--- a/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageBase.java
+++ b/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageBase.java
@@ -39,8 +39,11 @@ public abstract class MarriageBase implements Marriage {
     }
 
     @Override
-    public void register(Class<? extends Command> commandClass) {
+    public void register(Class<? extends Command> commandClass, Class<? extends Command>... commandClasses) {
         commandExecutor.register(commandClass);
+        for(Class<? extends Command> cmdclass : commandClasses) {
+            commandExecutor.register(cmdclass);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageCore.java b/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageCore.java
index 45d899b..81ef40c 100644
--- a/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageCore.java
+++ b/src/main/java/com/lenis0012/bukkit/marriage2/internal/MarriageCore.java
@@ -2,7 +2,7 @@ package com.lenis0012.bukkit.marriage2.internal;
 
 import com.lenis0012.bukkit.marriage2.MData;
 import com.lenis0012.bukkit.marriage2.MPlayer;
-import com.lenis0012.bukkit.marriage2.commands.Command;
+import com.lenis0012.bukkit.marriage2.commands.*;
 import com.lenis0012.bukkit.marriage2.config.Message;
 import com.lenis0012.bukkit.marriage2.config.Permissions;
 import com.lenis0012.bukkit.marriage2.config.Settings;
@@ -95,9 +95,29 @@ public class MarriageCore extends MarriageBase {
 
     @Register(name = "commands", type = Register.Type.ENABLE)
     public void registerCommands() {
-        for(Class<? extends Command> command : findClasses("com.lenis0012.bukkit.marriage2.commands", Command.class)) {
-            register(command);
-        }
+        register(
+                CommandChat.class,
+                CommandChatSpy.class,
+                CommandDivorce.class,
+                CommandGender.class,
+                CommandGift.class,
+                CommandHeal.class,
+                CommandHelp.class,
+                CommandHome.class,
+                CommandList.class,
+                CommandMarry.class,
+                CommandMigrate.class,
+                CommandPriest.class,
+                CommandPVP.class,
+                CommandReload.class,
+                CommandSeen.class,
+                CommandSethome.class,
+                CommandTeleport.class,
+                CommandUpdate.class
+        );
+//        for(Class<? extends Command> command : findClasses("com.lenis0012.bukkit.marriage2.commands", Command.class)) {
+//            register(command);
+//        }
     }
 
     @Register(name = "updater", type = Type.ENABLE, priority = 9)