From 3ba4776570eb4ae556d6d0c413568d3d10cfda23 Mon Sep 17 00:00:00 2001 From: T14D3 Date: Tue, 26 Nov 2024 11:48:42 +0100 Subject: [PATCH 1/2] Fix wither explosions breaking protected blocks --- gradle.properties | 2 +- .../blockprot/bukkit/listeners/EntityEventListener.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b795bcb3..3a699a08 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,5 +2,5 @@ blockProtVersion=1.2.3 nbtApiVersion=2.14.0 anvilGuiVersion=1.10.3-SNAPSHOT townyVersion=0.98.1.6 -papiVersion=2.11.0 +papiVersion=2.11.6 worldGuardVersion=7.0.7 diff --git a/spigot/src/main/java/de/sean/blockprot/bukkit/listeners/EntityEventListener.java b/spigot/src/main/java/de/sean/blockprot/bukkit/listeners/EntityEventListener.java index 485986e8..80a57581 100644 --- a/spigot/src/main/java/de/sean/blockprot/bukkit/listeners/EntityEventListener.java +++ b/spigot/src/main/java/de/sean/blockprot/bukkit/listeners/EntityEventListener.java @@ -20,6 +20,7 @@ import de.sean.blockprot.bukkit.BlockProt; import de.sean.blockprot.bukkit.nbt.BlockNBTHandler; +import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Entity; import org.bukkit.entity.FallingBlock; @@ -44,5 +45,10 @@ public void onEntityChangeBlock(@NotNull final EntityChangeBlockEvent event) { event.setCancelled(true); } } + else if (BlockProt.getDefaultConfig().isLockable(event.getBlock().getType())) { + BlockNBTHandler handler = new BlockNBTHandler(event.getBlock()); + if (handler.isProtected()) + event.setCancelled(true); + } } } From d133dd9d13ddb0cd3b52addcd6e0c84aa15571ac Mon Sep 17 00:00:00 2001 From: T14D3 <73843330+T14D3@users.noreply.github.com> Date: Tue, 26 Nov 2024 12:23:47 +0100 Subject: [PATCH 2/2] Removed unused imports --- .../de/sean/blockprot/bukkit/listeners/EntityEventListener.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spigot/src/main/java/de/sean/blockprot/bukkit/listeners/EntityEventListener.java b/spigot/src/main/java/de/sean/blockprot/bukkit/listeners/EntityEventListener.java index 80a57581..6998cbf6 100644 --- a/spigot/src/main/java/de/sean/blockprot/bukkit/listeners/EntityEventListener.java +++ b/spigot/src/main/java/de/sean/blockprot/bukkit/listeners/EntityEventListener.java @@ -20,7 +20,6 @@ import de.sean.blockprot.bukkit.BlockProt; import de.sean.blockprot.bukkit.nbt.BlockNBTHandler; -import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Entity; import org.bukkit.entity.FallingBlock;