From fb3d9ca499b65ca852587277bd33b57569ad1a4a Mon Sep 17 00:00:00 2001
From: drfiveminusmint <dr.fiveminusminusplays@gmail.com>
Date: Wed, 25 Sep 2024 10:28:47 -0400
Subject: [PATCH 1/2] Remove IgnoreCancelled

---
 .../APTurrets/listener/PlayerInteractListener.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/snowleopard1863/APTurrets/listener/PlayerInteractListener.java b/src/main/java/com/snowleopard1863/APTurrets/listener/PlayerInteractListener.java
index f74f9ae..1c76970 100644
--- a/src/main/java/com/snowleopard1863/APTurrets/listener/PlayerInteractListener.java
+++ b/src/main/java/com/snowleopard1863/APTurrets/listener/PlayerInteractListener.java
@@ -17,7 +17,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class PlayerInteractListener implements Listener {
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.NORMAL)
     public void onClick(@NotNull PlayerInteractEvent event) {
         event.setCancelled(switch (event.getAction()) {
             case RIGHT_CLICK_AIR -> rightClick(event);

From 75dccc835edac4e807c22fbeba1b63219b5f2942 Mon Sep 17 00:00:00 2001
From: drfiveminusmint <dr.fiveminusminusplays@gmail.com>
Date: Thu, 3 Oct 2024 16:44:51 -0400
Subject: [PATCH 2/2] Don't un-cancel events

---
 .../APTurrets/listener/PlayerInteractListener.java           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/snowleopard1863/APTurrets/listener/PlayerInteractListener.java b/src/main/java/com/snowleopard1863/APTurrets/listener/PlayerInteractListener.java
index 1c76970..88c67eb 100644
--- a/src/main/java/com/snowleopard1863/APTurrets/listener/PlayerInteractListener.java
+++ b/src/main/java/com/snowleopard1863/APTurrets/listener/PlayerInteractListener.java
@@ -19,12 +19,13 @@
 public class PlayerInteractListener implements Listener {
     @EventHandler(priority = EventPriority.NORMAL)
     public void onClick(@NotNull PlayerInteractEvent event) {
-        event.setCancelled(switch (event.getAction()) {
+        if(switch (event.getAction()) {
             case RIGHT_CLICK_AIR -> rightClick(event);
             case RIGHT_CLICK_BLOCK -> rightClickBlock(event);
             case LEFT_CLICK_BLOCK -> leftClickBlock(event);
             default -> false;
-        });
+        })
+            event.setCancelled(true); //don't un-cancel events
     }
 
     private boolean leftClickBlock(@NotNull PlayerInteractEvent event) {