Fix swapped admin commandsv3.5.1

3 files changed, 34 insertions, 34 deletions

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataCommandSwitcher.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataCommandSwitcher.java
index 69b708b4..9fbd10d0 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataCommandSwitcher.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataCommandSwitcher.java
@@ -14,8 +14,8 @@ public class AdminModdataCommandSwitcher extends CommandSwitcher {
         this.plugin = plugin;
 
         super.subcommands.put("fullreset", new AdminModdataFullresetCommandHandler(plugin));
-        super.subcommands.put("reset", new AdminModdataResetCommandHandler(plugin));
         super.subcommands.put("start", new AdminModdataStartCommandHandler(plugin));
+        super.subcommands.put("reset", new AdminModdataResetCommandHandler(plugin));
         super.subcommands.put("complete", new AdminModdataCompleteCommandHandler(plugin));
     }
 
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataResetCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataResetCommandHandler.java
index 3b707d5f..534d950f 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataResetCommandHandler.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataResetCommandHandler.java
@@ -3,7 +3,6 @@ package com.leonardobishop.quests.bukkit.command;
 import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
 import com.leonardobishop.quests.bukkit.util.CommandUtils;
 import com.leonardobishop.quests.bukkit.util.Messages;
-import com.leonardobishop.quests.common.enums.QuestStartResult;
 import com.leonardobishop.quests.common.player.QPlayer;
 import com.leonardobishop.quests.common.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.common.quest.Quest;
@@ -25,39 +24,15 @@ public class AdminModdataResetCommandHandler implements CommandHandler {
         if (args.length > 4) {
             QPlayer qPlayer = CommandUtils.getOtherPlayer(sender, args[3], plugin);
             if (qPlayer == null) return;
-            QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
             Quest quest = plugin.getQuestManager().getQuestById(args[4]);
             if (quest == null) {
                 sender.sendMessage(Messages.COMMAND_QUEST_START_DOESNTEXIST.getMessage().replace("{quest}", args[4]));
                 return;
             }
-            QuestStartResult response = qPlayer.startQuest(quest);
-            switch (response) {
-                case QUEST_LIMIT_REACHED:
-                    sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILLIMIT.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
-                    return;
-                case QUEST_ALREADY_COMPLETED:
-                    sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILCOMPLETE.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
-                    return;
-                case QUEST_COOLDOWN:
-                    sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILCOOLDOWN.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
-                    return;
-                case QUEST_LOCKED:
-                    sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILLOCKED.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
-                    return;
-                case QUEST_ALREADY_STARTED:
-                    sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILSTARTED.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
-                    return;
-                case QUEST_NO_PERMISSION:
-                    sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILPERMISSION.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
-                    return;
-                case NO_PERMISSION_FOR_CATEGORY:
-                    sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILCATEGORYPERMISSION.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
-                    return;
-            }
-
+            QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
+            questProgressFile.generateBlankQuestProgress(quest);
             plugin.getPlayerManager().savePlayerSync(qPlayer.getPlayerUUID(), questProgressFile);
-            sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_SUCCESS.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
+            sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_RESET_SUCCESS.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
 
             if (Bukkit.getPlayer(qPlayer.getPlayerUUID()) == null) {
                 plugin.getPlayerManager().dropPlayer(qPlayer.getPlayerUUID());
@@ -65,7 +40,7 @@ public class AdminModdataResetCommandHandler implements CommandHandler {
             return;
         }
 
-        sender.sendMessage(ChatColor.RED + "/quests a/admin moddata reset <player> <quest>");
+        sender.sendMessage(ChatColor.RED + "/quests a/admin moddata start <player> <quest>");
     }
 
     @Override
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataStartCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataStartCommandHandler.java
index 7feb1db2..54a98e5d 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataStartCommandHandler.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataStartCommandHandler.java
@@ -3,6 +3,7 @@ package com.leonardobishop.quests.bukkit.command;
 import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin;
 import com.leonardobishop.quests.bukkit.util.CommandUtils;
 import com.leonardobishop.quests.bukkit.util.Messages;
+import com.leonardobishop.quests.common.enums.QuestStartResult;
 import com.leonardobishop.quests.common.player.QPlayer;
 import com.leonardobishop.quests.common.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.common.quest.Quest;
@@ -24,15 +25,39 @@ public class AdminModdataStartCommandHandler implements CommandHandler {
         if (args.length > 4) {
             QPlayer qPlayer = CommandUtils.getOtherPlayer(sender, args[3], plugin);
             if (qPlayer == null) return;
+            QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
             Quest quest = plugin.getQuestManager().getQuestById(args[4]);
             if (quest == null) {
                 sender.sendMessage(Messages.COMMAND_QUEST_START_DOESNTEXIST.getMessage().replace("{quest}", args[4]));
                 return;
             }
-            QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile();
-            questProgressFile.generateBlankQuestProgress(quest);
+            QuestStartResult response = qPlayer.startQuest(quest);
+            switch (response) {
+                case QUEST_LIMIT_REACHED:
+                    sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILLIMIT.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
+                    return;
+                case QUEST_ALREADY_COMPLETED:
+                    sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILCOMPLETE.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
+                    return;
+                case QUEST_COOLDOWN:
+                    sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILCOOLDOWN.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
+                    return;
+                case QUEST_LOCKED:
+                    sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILLOCKED.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
+                    return;
+                case QUEST_ALREADY_STARTED:
+                    sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILSTARTED.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
+                    return;
+                case QUEST_NO_PERMISSION:
+                    sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILPERMISSION.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
+                    return;
+                case NO_PERMISSION_FOR_CATEGORY:
+                    sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILCATEGORYPERMISSION.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
+                    return;
+            }
+
             plugin.getPlayerManager().savePlayerSync(qPlayer.getPlayerUUID(), questProgressFile);
-            sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_RESET_SUCCESS.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
+            sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_SUCCESS.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId()));
 
             if (Bukkit.getPlayer(qPlayer.getPlayerUUID()) == null) {
                 plugin.getPlayerManager().dropPlayer(qPlayer.getPlayerUUID());
@@ -40,7 +65,7 @@ public class AdminModdataStartCommandHandler implements CommandHandler {
             return;
         }
 
-        sender.sendMessage(ChatColor.RED + "/quests a/admin moddata start <player> <quest>");
+        sender.sendMessage(ChatColor.RED + "/quests a/admin moddata reset <player> <quest>");
     }
 
     @Override