From 00d9dc9abf335b8f2829397515b02784981206cd Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Fri, 5 Mar 2021 06:33:48 -0500
Subject: [PATCH] Hotbar button cannot be negative, fixes #1631

---
 .../me/blackvein/quests/listeners/PlayerListener.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 a7e58ccb7..c6cea7590 100644
--- a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
+++ b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
@@ -94,10 +94,11 @@ public class PlayerListener implements Listener {
                 evt.setCancelled(true);
                 return;
             }
-        } else if (ac.equals(InventoryAction.SWAP_WITH_CURSOR)) {
-            final ItemStack item = evt.getWhoClicked().getInventory().getItem(evt.getHotbarButton());
-            if (item != null) {
-               if (ItemUtil.isItem(item) && ItemUtil.isJournal(item)) {
+        } else if (ac.equals(InventoryAction.SWAP_WITH_CURSOR) || ac.equals(InventoryAction.HOTBAR_SWAP)
+                || ac.equals(InventoryAction.HOTBAR_MOVE_AND_READD)) {
+            if (evt.getHotbarButton() > -1) {
+                final ItemStack item = evt.getWhoClicked().getInventory().getItem(evt.getHotbarButton());
+                if (ItemUtil.isItem(item) && ItemUtil.isJournal(item)) {
                     evt.setCancelled(true);
                     return;
                 }