From d6c4755fba2e27754d427de75185fe049fcc6549 Mon Sep 17 00:00:00 2001 From: Quintin Dunn <93884113+quintindunn@users.noreply.github.com> Date: Sun, 9 Mar 2025 20:39:51 -0400 Subject: [PATCH] Fix logging caused by wind charges (#701) * Fixed blocks broken by wind charges not being logged * Fixed wind charges still logging invalid block breaks when they're a 'breeze_wind_charge' --- .../listener/entity/EntityChangeBlockListener.java | 7 +++++++ .../coreprotect/listener/entity/EntityExplodeListener.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/coreprotect/listener/entity/EntityChangeBlockListener.java b/src/main/java/net/coreprotect/listener/entity/EntityChangeBlockListener.java index de3a53f..31aaf73 100644 --- a/src/main/java/net/coreprotect/listener/entity/EntityChangeBlockListener.java +++ b/src/main/java/net/coreprotect/listener/entity/EntityChangeBlockListener.java @@ -10,6 +10,7 @@ import org.bukkit.entity.Fox; import org.bukkit.entity.Ravager; import org.bukkit.entity.Silverfish; import org.bukkit.entity.Turtle; +import org.bukkit.entity.WindCharge; import org.bukkit.entity.Wither; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -53,6 +54,12 @@ public final class EntityChangeBlockListener extends Queue implements Listener { e = "#silverfish"; } } + else if (entity instanceof WindCharge) { + e = "#windcharge"; + } + else if (entity.getType().name().equals("BREEZE_WIND_CHARGE")) { + e = "#breezewindcharge"; + } if (e.length() > 0) { if (newtype.equals(Material.AIR) || newtype.equals(Material.CAVE_AIR)) { Queue.queueBlockBreak(e, block.getState(), type, block.getBlockData().getAsString(), 0); diff --git a/src/main/java/net/coreprotect/listener/entity/EntityExplodeListener.java b/src/main/java/net/coreprotect/listener/entity/EntityExplodeListener.java index 4490777..79800a3 100755 --- a/src/main/java/net/coreprotect/listener/entity/EntityExplodeListener.java +++ b/src/main/java/net/coreprotect/listener/entity/EntityExplodeListener.java @@ -24,7 +24,7 @@ public final class EntityExplodeListener extends Queue implements Listener { @EventHandler(priority = EventPriority.MONITOR) protected void onEntityExplode(EntityExplodeEvent event) { Entity entity = event.getEntity(); - if (entity.getType().name().equals("WIND_CHARGE")) { + if (entity.getType().name().equals("WIND_CHARGE") || entity.getType().name().equals("BREEZE_WIND_CHARGE")) { return; }