diff options
| author | fatpigsarefat <fatpigsarefat@outlook.com> | 2018-06-01 17:02:28 +0100 |
|---|---|---|
| committer | fatpigsarefat <fatpigsarefat@outlook.com> | 2018-06-01 17:02:28 +0100 |
| commit | 1a6e7098c43efcd3d21dc578c8983eba9dcb6de1 (patch) | |
| tree | 85ba34fdb97b3eaf34969f34da81292684109a93 /src/me/fatpigsarefat/quests/commands/CommandQuests.java | |
| parent | 0058e6b4b56b45568ddf04f27c7d6273a5c1aa23 (diff) | |
Right click to cancel quests, closes #9
Diffstat (limited to 'src/me/fatpigsarefat/quests/commands/CommandQuests.java')
| -rw-r--r-- | src/me/fatpigsarefat/quests/commands/CommandQuests.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/me/fatpigsarefat/quests/commands/CommandQuests.java b/src/me/fatpigsarefat/quests/commands/CommandQuests.java index 46258d64..8c9baec7 100644 --- a/src/me/fatpigsarefat/quests/commands/CommandQuests.java +++ b/src/me/fatpigsarefat/quests/commands/CommandQuests.java @@ -176,6 +176,7 @@ public class CommandQuests implements CommandExecutor { return true; } } else if (args[1].equalsIgnoreCase("moddata")) { + boolean success = false; Player player; OfflinePlayer ofp; UUID uuid; @@ -196,19 +197,19 @@ public class CommandQuests implements CommandExecutor { } if (Quests.getPlayerManager().getPlayer(uuid) == null) { sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_NODATA.getMessage().replace("{player}", name)); - return true; + success = true; } QuestProgressFile questProgressFile = Quests.getPlayerManager().getPlayer(uuid).getQuestProgressFile(); Quest quest = Quests.getQuestManager().getQuestById(args[4]); if (quest == null) { sender.sendMessage(Messages.COMMAND_QUEST_START_DOESNTEXIST.getMessage().replace("{quest}", args[4])); - return true; + success = true; } if (args[2].equalsIgnoreCase("reset")) { questProgressFile.generateBlankQuestProgress(quest.getId()); questProgressFile.saveToDisk(); sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_RESET_SUCCESS.getMessage().replace("{player}", name).replace("{quest}", quest.getId())); - return true; + success = true; } else if (args[2].equalsIgnoreCase("start")) { int response = questProgressFile.startQuest(quest); if (response == 1) { @@ -226,17 +227,19 @@ public class CommandQuests implements CommandExecutor { } questProgressFile.saveToDisk(); sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_SUCCESS.getMessage().replace("{player}", name).replace("{quest}", quest.getId())); - return true; + success = true; } else if (args[2].equalsIgnoreCase("complete")) { questProgressFile.completeQuest(quest); questProgressFile.saveToDisk(); sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_COMPLETE_SUCCESS.getMessage().replace("{player}", name).replace("{quest}", quest.getId())); - return true; + success = true; } if (Quests.getPlayerManager().getPlayer(uuid).isOnlyDataLoaded()) { Quests.getPlayerManager().removePlayer(uuid); } - showAdminHelp(sender, "moddata"); + if (!success) { + showAdminHelp(sender, "moddata"); + } return true; } |