Remove cancel ability from auto-started quests (fixes #260)

2 files changed, 6 insertions, 2 deletions

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java
index 881ba3fa..d4e6d5ce 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java
@@ -221,7 +221,7 @@ public class QuestQMenu implements QMenu {
                 QuestMenuElement questMenuElement = (QuestMenuElement) menuElement;
                 Quest quest = plugin.getQuestManager().getQuestById(questMenuElement.getQuestId());
                 if (event.getClick() == ClickType.LEFT) {
-                    if (config.getBoolean("options.quest-autostart")) return false;
+                    if (config.getBoolean("options.quest-autostart") || quest.isAutoStartEnabled()) return false;
                     if (owner.startQuest(quest) == QuestStartResult.QUEST_SUCCESS) {
                         event.getWhoClicked().closeInventory(); //TODO Option to keep the menu open
                     }
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/MenuUtils.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/MenuUtils.java
index 7e3a97b4..230d596c 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/MenuUtils.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/MenuUtils.java
@@ -63,7 +63,11 @@ public class MenuUtils {
 
     public static void handleRightClick(BukkitQuestsPlugin plugin, QMenu menu, Quest quest, Player player, MenuController controller) {
         if (menu.getOwner().hasStartedQuest(quest)) {
-            if (!plugin.getQuestsConfig().getBoolean("options.allow-quest-cancel")) return;
+            if (!plugin.getQuestsConfig().getBoolean("options.allow-quest-cancel")
+                    || plugin.getConfig().getBoolean("options.quest-autostart")
+                    || quest.isAutoStartEnabled()) {
+                return;
+            }
             if (plugin.getQuestsConfig().getBoolean("options.gui-confirm-cancel", true)) {
                 CancelQMenu cancelQMenu = new CancelQMenu(plugin, menu, menu.getOwner(), quest);
                 controller.openMenu(player, cancelQMenu, 1);