From 224f4a9f1e193958e0aee204d365830284b933ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elias=20M=C3=BCller?= <elias@elias-mueller.com>
Date: Tue, 24 Dec 2024 18:06:43 +0100
Subject: [PATCH] fixed pixelblocks being placable in protected regions

---
 .../pixelblocks/listeners/BreakPixelBlockListener.java         | 2 +-
 .../pixelblocks/listeners/PlacePixelBlockListener.java         | 3 ++-
 .../eu/mhsl/minecraft/pixelblocks/utils/EventCanceling.java    | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/BreakPixelBlockListener.java b/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/BreakPixelBlockListener.java
index 5843e2d..5d1be1c 100644
--- a/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/BreakPixelBlockListener.java
+++ b/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/BreakPixelBlockListener.java
@@ -8,7 +8,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
 public class BreakPixelBlockListener implements Listener {
-    @EventHandler(ignoreCancelled = true)
+    @EventHandler
     public void destroyPixelBlock(PrePlayerAttackEntityEvent event) {
         if(!(event.getAttacked() instanceof Interaction)) return;
 
diff --git a/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/PlacePixelBlockListener.java b/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/PlacePixelBlockListener.java
index ac540eb..ddaef3e 100644
--- a/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/PlacePixelBlockListener.java
+++ b/src/main/java/eu/mhsl/minecraft/pixelblocks/listeners/PlacePixelBlockListener.java
@@ -10,12 +10,13 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.inventory.ItemStack;
 
 public class PlacePixelBlockListener implements Listener {
-    @EventHandler(ignoreCancelled = true)
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
     public void onBlockPlace(BlockPlaceEvent event) {
         ItemStack usedItem = event.getItemInHand();
         PixelBlockItem.BlockInfo info = PixelBlockItem.getBlockInfo(usedItem);
diff --git a/src/main/java/eu/mhsl/minecraft/pixelblocks/utils/EventCanceling.java b/src/main/java/eu/mhsl/minecraft/pixelblocks/utils/EventCanceling.java
index bdce890..26f4cfd 100644
--- a/src/main/java/eu/mhsl/minecraft/pixelblocks/utils/EventCanceling.java
+++ b/src/main/java/eu/mhsl/minecraft/pixelblocks/utils/EventCanceling.java
@@ -1,5 +1,6 @@
 package eu.mhsl.minecraft.pixelblocks.utils;
 
+import eu.mhsl.minecraft.pixelblocks.Main;
 import eu.mhsl.minecraft.pixelblocks.pixelblock.PixelBlock;
 import eu.mhsl.minecraft.pixelblocks.pixelblock.PixelBlockWorld;
 import org.bukkit.World;
@@ -13,6 +14,7 @@ public class EventCanceling {
         if(!PixelBlockWorld.isPixelWorld(world)) return;
         @Nullable PixelBlock pixelBlock = PixelBlock.getPixelBlockFromBlockWorld(world);
         if(pixelBlock == null) {
+            Main.logger().warning("Cancelling place event because PixelBlock could not be found: " + world.getName());
             event.setCancelled(true);
             return;
         }