From d099f3ee552185d50c1a21165ca2f2df477aa6f0 Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Thu, 13 Jan 2022 23:26:01 +0100
Subject: [PATCH] Added EventHandler piorities

---
 src/main/java/com/alttd/listeners/BlockBreakListener.java | 5 ++++-
 src/main/java/com/alttd/listeners/BlockPlaceListener.java | 5 ++++-
 src/main/java/com/alttd/listeners/DeathListener.java      | 5 ++++-
 src/main/java/com/alttd/listeners/GUIListener.java        | 3 ++-
 src/main/java/com/alttd/listeners/PlayerJoinListener.java | 5 ++---
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/alttd/listeners/BlockBreakListener.java b/src/main/java/com/alttd/listeners/BlockBreakListener.java
index 43f0c02..613a8dd 100644
--- a/src/main/java/com/alttd/listeners/BlockBreakListener.java
+++ b/src/main/java/com/alttd/listeners/BlockBreakListener.java
@@ -5,6 +5,7 @@ import com.alttd.objects.APartType;
 import com.alttd.objects.ParticleSet;
 import com.alttd.storage.PlayerSettings;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -19,8 +20,10 @@ public class BlockBreakListener implements Listener {
         particlesToActivate = List.of(particleTypes);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onBlockBreak(BlockBreakEvent event) {
+        if (event.isCancelled())
+            return;
         new BukkitRunnable() {
             @Override
             public void run() {
diff --git a/src/main/java/com/alttd/listeners/BlockPlaceListener.java b/src/main/java/com/alttd/listeners/BlockPlaceListener.java
index 572114e..3046f5c 100644
--- a/src/main/java/com/alttd/listeners/BlockPlaceListener.java
+++ b/src/main/java/com/alttd/listeners/BlockPlaceListener.java
@@ -5,6 +5,7 @@ import com.alttd.objects.APartType;
 import com.alttd.objects.ParticleSet;
 import com.alttd.storage.PlayerSettings;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -19,8 +20,10 @@ public class BlockPlaceListener implements Listener {
         particlesToActivate = List.of(particleTypes);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onBlockPlace(BlockPlaceEvent event) {
+        if (event.isCancelled())
+            return;
         new BukkitRunnable() {
             @Override
             public void run() {
diff --git a/src/main/java/com/alttd/listeners/DeathListener.java b/src/main/java/com/alttd/listeners/DeathListener.java
index ed3d3d8..a64aea2 100644
--- a/src/main/java/com/alttd/listeners/DeathListener.java
+++ b/src/main/java/com/alttd/listeners/DeathListener.java
@@ -6,6 +6,7 @@ import com.alttd.objects.ParticleSet;
 import com.alttd.storage.PlayerSettings;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -20,8 +21,10 @@ public class DeathListener implements Listener {
         particlesToActivate = List.of(particleTypes);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onDeath(PlayerDeathEvent event) {
+        if (event.isCancelled())
+            return;
         new BukkitRunnable() {
             @Override
             public void run() {
diff --git a/src/main/java/com/alttd/listeners/GUIListener.java b/src/main/java/com/alttd/listeners/GUIListener.java
index f63afa5..bdb127d 100644
--- a/src/main/java/com/alttd/listeners/GUIListener.java
+++ b/src/main/java/com/alttd/listeners/GUIListener.java
@@ -5,6 +5,7 @@ import com.alttd.gui.GUI;
 import com.alttd.gui.GUIAction;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
@@ -17,7 +18,7 @@ public class GUIListener implements Listener {
      * Handles clicking inside a gui
      * @param event gui click event
      */
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGH)
     public void onClick(InventoryClickEvent event){
         if (!(event.getWhoClicked() instanceof Player player)){
             return;
diff --git a/src/main/java/com/alttd/listeners/PlayerJoinListener.java b/src/main/java/com/alttd/listeners/PlayerJoinListener.java
index 137e371..4da2e06 100644
--- a/src/main/java/com/alttd/listeners/PlayerJoinListener.java
+++ b/src/main/java/com/alttd/listeners/PlayerJoinListener.java
@@ -7,10 +7,9 @@ import com.alttd.objects.ParticleSet;
 import com.alttd.storage.PlayerSettings;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.List;
@@ -24,7 +23,7 @@ public class PlayerJoinListener implements Listener {
         particlesToActivate = List.of(particleTypes);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(PlayerJoinEvent event) {
         new BukkitRunnable() {
             @Override