aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/com/leonardobishop
diff options
context:
space:
mode:
authorLMBishop <13875753+LMBishop@users.noreply.github.com>2020-04-23 01:30:45 +0100
committerLMBishop <13875753+LMBishop@users.noreply.github.com>2020-04-23 01:30:45 +0100
commit0502a296ee8d69fdd1f4d71e51e9e3af421249f2 (patch)
tree0d372753c1903cc2b156c81b56d4715957854f33 /src/main/java/com/leonardobishop
parent974255ae379293d8b02a4e353565450038020390 (diff)
Fixes #89
Diffstat (limited to 'src/main/java/com/leonardobishop')
-rw-r--r--src/main/java/com/leonardobishop/quests/events/EventInventory.java3
-rw-r--r--src/main/java/com/leonardobishop/quests/obj/Items.java2
2 files changed, 3 insertions, 2 deletions
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;