From 2cfd0beb6f2d9cae880ee4ca27dc423aba0de777 Mon Sep 17 00:00:00 2001
From: HexedHero <6012891+HexedHero@users.noreply.github.com>
Date: Tue, 3 May 2022 00:13:14 +0100
Subject: [PATCH] Ignore all cancelled events

---
 .../mattstudios/citizenscmd/listeners/NPCClickListener.java | 6 +++---
 .../me/mattstudios/citizenscmd/listeners/NPCListener.java   | 2 +-
 .../me/mattstudios/citizenscmd/listeners/UpdateEvent.java   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/me/mattstudios/citizenscmd/listeners/NPCClickListener.java b/src/main/java/me/mattstudios/citizenscmd/listeners/NPCClickListener.java
index 967f1cf..0eece10 100644
--- a/src/main/java/me/mattstudios/citizenscmd/listeners/NPCClickListener.java
+++ b/src/main/java/me/mattstudios/citizenscmd/listeners/NPCClickListener.java
@@ -67,7 +67,7 @@ public class NPCClickListener implements Listener {
         Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, "BungeeCord");
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onRightClick(NPCRightClickEvent event) {
         final NPC npc = event.getNPC();
         final Player player = event.getClicker();
@@ -150,7 +150,7 @@ public class NPCClickListener implements Listener {
 
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onLeftClick(NPCLeftClickEvent event) {
         final NPC npc = event.getNPC();
         final Player player = event.getClicker();
@@ -228,7 +228,7 @@ public class NPCClickListener implements Listener {
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onRemoveNPC(NPCRemoveEvent event) {
         if (!plugin.getDataHandler().hasNPCData(event.getNPC().getId())) {
             return;
diff --git a/src/main/java/me/mattstudios/citizenscmd/listeners/NPCListener.java b/src/main/java/me/mattstudios/citizenscmd/listeners/NPCListener.java
index 5772c62..b77b5ec 100644
--- a/src/main/java/me/mattstudios/citizenscmd/listeners/NPCListener.java
+++ b/src/main/java/me/mattstudios/citizenscmd/listeners/NPCListener.java
@@ -15,7 +15,7 @@ public class NPCListener implements Listener {
         this.plugin = plugin;
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void on(NPCCloneEvent event) {
         if (!plugin.getDataHandler().hasNPCData(event.getNPC().getId())) {
             return;
diff --git a/src/main/java/me/mattstudios/citizenscmd/listeners/UpdateEvent.java b/src/main/java/me/mattstudios/citizenscmd/listeners/UpdateEvent.java
index ad43396..41ae39b 100644
--- a/src/main/java/me/mattstudios/citizenscmd/listeners/UpdateEvent.java
+++ b/src/main/java/me/mattstudios/citizenscmd/listeners/UpdateEvent.java
@@ -42,7 +42,7 @@ public class UpdateEvent implements Listener {
         this.plugin = plugin;
     }
 
-    @EventHandler(priority = EventPriority.NORMAL)
+    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onPlayerJoin(PlayerJoinEvent event) {
         if (!plugin.isUpdateStatus() || !event.getPlayer().hasPermission("citizenscmd.update")) {
             return;