From ab0879d5a3376bb439b329a8e22bd112beccf4f5 Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Tue, 25 Apr 2023 19:47:55 -0400 Subject: [PATCH] Prevent item place during brew obj, fixes #2096 --- .../quests/listeners/ItemListener.java | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/me/blackvein/quests/listeners/ItemListener.java b/core/src/main/java/me/blackvein/quests/listeners/ItemListener.java index 5f2983e05..822518dfd 100644 --- a/core/src/main/java/me/blackvein/quests/listeners/ItemListener.java +++ b/core/src/main/java/me/blackvein/quests/listeners/ItemListener.java @@ -130,7 +130,8 @@ public class ItemListener implements Listener { } } } else if (event.getInventory().getType() == InventoryType.BREWING) { - if (event.getSlotType() == SlotType.CRAFTING) { + if (event.getSlotType() == SlotType.CRAFTING + || event.getAction().equals(InventoryAction.MOVE_TO_OTHER_INVENTORY)) { final IQuester quester = plugin.getQuester(player.getUniqueId()); final ObjectiveType type = ObjectiveType.BREW_ITEM; final Set dispatchedQuestIDs = new HashSet<>(); @@ -141,13 +142,17 @@ public class ItemListener implements Listener { if (quester.getCurrentQuestsTemp().containsKey(quest) && quester.getCurrentStage(quest).containsObjective(type)) { - quester.brewItem(quest, event.getCurrentItem()); + if (isAllowedBrewingAction(event)) { + quester.brewItem(quest, event.getCurrentItem()); + } } dispatchedQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, type, (final IQuester q, final IQuest cq) -> { if (!dispatchedQuestIDs.contains(cq.getId())) { - q.brewItem(cq, event.getCurrentItem()); + if (isAllowedBrewingAction(event)) { + q.brewItem(cq, event.getCurrentItem()); + } } return null; })); @@ -156,6 +161,25 @@ public class ItemListener implements Listener { } } } + + public boolean isAllowedBrewingAction(final InventoryClickEvent event) { + final int slot = event.getRawSlot(); + final InventoryAction action = event.getAction(); + // Prevent shift-click into Brewing Stand + if (event.getSlotType() != SlotType.CRAFTING && action.equals(InventoryAction.MOVE_TO_OTHER_INVENTORY)) { + event.setCancelled(true); + return false; + } + // Prevent placing into Brewing Stand + if (slot == 0 || slot == 1 || slot == 2) { + if (action.equals(InventoryAction.PLACE_ONE) || action.equals(InventoryAction.PLACE_SOME) + || action.equals(InventoryAction.PLACE_ALL)) { + event.setCancelled(true); + return false; + } + } + return true; + } @EventHandler public void onEnchantItem(final EnchantItemEvent event) { @@ -198,7 +222,6 @@ public class ItemListener implements Listener { } } - @EventHandler public void onConsumeItem(final PlayerItemConsumeEvent event) { if (event.isCancelled()) {