From e50c8a87fd3586b1e293cf781e235718f8a9c7b2 Mon Sep 17 00:00:00 2001
From: smuddgge <68658429+smuddgge@users.noreply.github.com>
Date: Wed, 1 Jun 2022 23:44:34 +0100
Subject: [PATCH] Updated pom.xml and fixed valid click

---
 pom.xml                                       | 14 +++++--------
 .../event/player/events/Click.java            | 20 ++++++++++---------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 18dc182..3454093 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
         <repository>
-            <id>vault-repo</id>
-            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
         </repository>
         <repository>
             <id>placeholderapi</id>
@@ -42,18 +42,14 @@
             <version>1.13.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency> <!-- Spigot (this includes Spigot API, Bukkit API, Craftbukkit and NMS) -->
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
-            <version>1.13.2-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
+        <!-- Vault -->
         <dependency>
-            <groupId>net.milkbowl.vault</groupId>
+            <groupId>com.github.MilkBowl</groupId>
             <artifactId>VaultAPI</artifactId>
             <version>1.7</version>
             <scope>provided</scope>
         </dependency>
+        <!-- Placeholder API -->
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
diff --git a/src/main/java/me/SuperRonanCraft/BetterBowTrails/event/player/events/Click.java b/src/main/java/me/SuperRonanCraft/BetterBowTrails/event/player/events/Click.java
index 416d0fe..bbb353f 100644
--- a/src/main/java/me/SuperRonanCraft/BetterBowTrails/event/player/events/Click.java
+++ b/src/main/java/me/SuperRonanCraft/BetterBowTrails/event/player/events/Click.java
@@ -129,22 +129,24 @@ public static boolean isNumeric(String str) {
     }
 
     private boolean validClick(InventoryClickEvent e) {
-        if (!(e.getWhoClicked() instanceof Player) || e.isCancelled())
+        // Check if a player clicked the inventory
+        if (!(e.getWhoClicked() instanceof Player))
             return false;
-        // Clicks the inventory
-        if (!e.getInventory().equals(invs.get(e.getWhoClicked())))
+
+        // Check if event was canceled
+        if (e.isCancelled())
             return false;
-        // Checks if click is valid
-        try {
-            e.getCurrentItem().getItemMeta().getDisplayName();
-        } catch (NullPointerException ex) {
+
+        // Check if they clicked a GUI from this plugin
+        if (!e.getInventory().equals(invs.get(e.getWhoClicked())))
             return false;
-        }
-        // Clicks their own inventory
+
+        // Check if they clicked their own inventory
         if (!e.getClickedInventory().equals(invs.get(e.getWhoClicked()))) {
             e.setCancelled(true);
             return false;
         }
+
         return true;
     }
 }