From 1644f18549c417c3d72f5c00bec794e47c917b1e Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Fri, 18 Jun 2021 18:26:37 -0400
Subject: [PATCH] Ignore inconsequential inventory clicks, fixes #1718

---
 .../blackvein/quests/convo/quests/rewards/RewardsPrompt.java | 4 ++--
 .../java/me/blackvein/quests/listeners/ItemListener.java     | 4 ++++
 .../java/me/blackvein/quests/listeners/PlayerListener.java   | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/main/src/main/java/me/blackvein/quests/convo/quests/rewards/RewardsPrompt.java b/main/src/main/java/me/blackvein/quests/convo/quests/rewards/RewardsPrompt.java
index de00bfa9b..dd738f0cb 100644
--- a/main/src/main/java/me/blackvein/quests/convo/quests/rewards/RewardsPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/quests/rewards/RewardsPrompt.java
@@ -191,7 +191,7 @@ public class RewardsPrompt extends QuestsEditorNumericPrompt {
                     return ChatColor.GRAY + "(" + Lang.get("noneSet") + ")";
                 } else {
                     final int moneyRew = (Integer) context.getSessionData(CK.REW_MONEY);
-                    return ChatColor.GRAY + "(" + ChatColor.AQUA + moneyRew + " "
+                    return ChatColor.GRAY + "(" + ChatColor.AQUA
                             + plugin.getDependencies().getVaultEconomy().format(moneyRew) + ChatColor.GRAY + ")";
                 }
             } else {
@@ -496,7 +496,7 @@ public class RewardsPrompt extends QuestsEditorNumericPrompt {
             String text = getQueryText(context);
             if (plugin.getDependencies().getVaultEconomy() != null) {
                 text = text.replace("<money>", ChatColor.AQUA
-                        + (plugin.getDependencies().getVaultEconomy().currencyNamePlural() + ChatColor.YELLOW));
+                        + plugin.getDependencies().getVaultEconomy().currencyNamePlural() + ChatColor.YELLOW);
             }
             return ChatColor.YELLOW + text;
         }
diff --git a/main/src/main/java/me/blackvein/quests/listeners/ItemListener.java b/main/src/main/java/me/blackvein/quests/listeners/ItemListener.java
index fc152a891..ff5cb40d3 100644
--- a/main/src/main/java/me/blackvein/quests/listeners/ItemListener.java
+++ b/main/src/main/java/me/blackvein/quests/listeners/ItemListener.java
@@ -21,6 +21,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.enchantment.EnchantItemEvent;
 import org.bukkit.event.inventory.CraftItemEvent;
+import org.bukkit.event.inventory.InventoryAction;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.inventory.InventoryType.SlotType;
@@ -42,6 +43,9 @@ public class ItemListener implements Listener {
     
     @EventHandler
     public void onCraftItem(final CraftItemEvent evt) {
+        if (evt.getAction().equals(InventoryAction.NOTHING)) {
+            return;
+        }
         if (evt.getWhoClicked() instanceof Player) {
             final Player player = (Player) evt.getWhoClicked();
             if (plugin.canUseQuests(player.getUniqueId())) {
diff --git a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
index 09ec9edf6..dd5644d04 100644
--- a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
+++ b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
@@ -84,8 +84,11 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onInventoryClickEvent(final InventoryClickEvent evt) {
         final InventoryAction ac = evt.getAction();
+        if (ac.equals(InventoryAction.NOTHING)) {
+            return;
+        }
         if (ItemUtil.isItem(evt.getCurrentItem()) && ItemUtil.isJournal(evt.getCurrentItem())) {
-            if (ac.equals(InventoryAction.MOVE_TO_OTHER_INVENTORY) || ac.equals(InventoryAction.DROP_ALL_SLOT) 
+            if (ac.equals(InventoryAction.MOVE_TO_OTHER_INVENTORY) || ac.equals(InventoryAction.DROP_ALL_SLOT)
                     || ac.equals(InventoryAction.DROP_ONE_SLOT)) {
                 evt.setCancelled(true);
                 return;