From 0502a296ee8d69fdd1f4d71e51e9e3af421249f2 Mon Sep 17 00:00:00 2001 From: LMBishop <13875753+LMBishop@users.noreply.github.com> Date: Thu, 23 Apr 2020 01:30:45 +0100 Subject: Fixes #89 --- pom.xml | 2 +- src/main/java/com/leonardobishop/quests/events/EventInventory.java | 3 ++- src/main/java/com/leonardobishop/quests/obj/Items.java | 2 +- src/main/resources/config.yml | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index fe8e1e4b..aad5387b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.leonardobishop quests - 2.9.2 + 2.9.3 Quests diff --git a/src/main/java/com/leonardobishop/quests/events/EventInventory.java b/src/main/java/com/leonardobishop/quests/events/EventInventory.java index 804c640a..aba0b12f 100644 --- a/src/main/java/com/leonardobishop/quests/events/EventInventory.java +++ b/src/main/java/com/leonardobishop/quests/events/EventInventory.java @@ -87,7 +87,8 @@ public class EventInventory implements Listener { if (qMenuQuest.getOwner().getQuestProgressFile().startQuest(quest) == QuestStartResult.QUEST_SUCCESS) { event.getWhoClicked().closeInventory(); //TODO Option to keep the menu open } - } else if (event.getClick() == ClickType.RIGHT && Options.ALLOW_QUEST_CANCEL.getBooleanValue()) { + } else if (event.getClick() == ClickType.RIGHT && Options.ALLOW_QUEST_CANCEL.getBooleanValue() + && qMenuQuest.getOwner().getQuestProgressFile().hasStartedQuest(quest)) { QMenuCancel qMenuCancel = new QMenuCancel(qMenuQuest.getOwner(), qMenuQuest, quest); buffer.add(event.getWhoClicked().getUniqueId()); event.getWhoClicked().openInventory(qMenuCancel.toInventory()); diff --git a/src/main/java/com/leonardobishop/quests/obj/Items.java b/src/main/java/com/leonardobishop/quests/obj/Items.java index aa1aaa06..1b4d78f1 100644 --- a/src/main/java/com/leonardobishop/quests/obj/Items.java +++ b/src/main/java/com/leonardobishop/quests/obj/Items.java @@ -15,7 +15,7 @@ public enum Items { PAGE_DESCRIPTION("gui.page-desc"), QUEST_CANCEL_YES("gui.quest-cancel-yes"), QUEST_CANCEL_NO("gui.quest-cancel-no"), - QUEST_CANCEL_BORDER("gui.quest-cancel-background"); + QUEST_CANCEL_BACKGROUND("gui.quest-cancel-background"); private final String path; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 001508a0..18283128 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -53,6 +53,7 @@ categories: permission-required: true # The items listed below are placeholder items for quests which the player cannot start. +# You should change these for 1.8 gui: back-button: name: "&cReturn" -- cgit v1.2.3-70-g09d2