From 1a6e7098c43efcd3d21dc578c8983eba9dcb6de1 Mon Sep 17 00:00:00 2001 From: fatpigsarefat Date: Fri, 1 Jun 2018 17:02:28 +0100 Subject: Right click to cancel quests, closes #9 --- src/me/fatpigsarefat/quests/events/EventInventory.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/me/fatpigsarefat/quests/events/EventInventory.java') diff --git a/src/me/fatpigsarefat/quests/events/EventInventory.java b/src/me/fatpigsarefat/quests/events/EventInventory.java index 08d6ae63..9911c216 100644 --- a/src/me/fatpigsarefat/quests/events/EventInventory.java +++ b/src/me/fatpigsarefat/quests/events/EventInventory.java @@ -8,6 +8,7 @@ import me.fatpigsarefat.quests.obj.misc.QMenuQuest; import me.fatpigsarefat.quests.quests.Quest; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; @@ -51,8 +52,14 @@ public class EventInventory implements Listener { .getCurrentPage()) - 1) * qMenuQuest.getPageSize()))) { String questid = qMenuQuest.getSlotsToMenu().get(event.getSlot()); Quest quest = Quests.getQuestManager().getQuestById(questid); - if (qMenuQuest.getOwner().getQuestProgressFile().startQuest(quest) == 0) { - event.getWhoClicked().closeInventory(); + if (event.getClick() == ClickType.LEFT) { + if (qMenuQuest.getOwner().getQuestProgressFile().startQuest(quest) == 0) { + event.getWhoClicked().closeInventory(); + } + } else if (event.getClick() == ClickType.RIGHT) { + if (qMenuQuest.getOwner().getQuestProgressFile().cancelQuest(quest)) { + event.getWhoClicked().closeInventory(); + } } } } else if (qMenu instanceof QMenuCategory) { -- cgit v1.2.3-70-g09d2