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'
This commit is contained in:
Quintin Dunn 2025-03-09 20:39:51 -04:00 committed by GitHub
parent 67336168fb
commit d6c4755fba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions

View file

@ -10,6 +10,7 @@ import org.bukkit.entity.Fox;
import org.bukkit.entity.Ravager; import org.bukkit.entity.Ravager;
import org.bukkit.entity.Silverfish; import org.bukkit.entity.Silverfish;
import org.bukkit.entity.Turtle; import org.bukkit.entity.Turtle;
import org.bukkit.entity.WindCharge;
import org.bukkit.entity.Wither; import org.bukkit.entity.Wither;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -53,6 +54,12 @@ public final class EntityChangeBlockListener extends Queue implements Listener {
e = "#silverfish"; 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 (e.length() > 0) {
if (newtype.equals(Material.AIR) || newtype.equals(Material.CAVE_AIR)) { if (newtype.equals(Material.AIR) || newtype.equals(Material.CAVE_AIR)) {
Queue.queueBlockBreak(e, block.getState(), type, block.getBlockData().getAsString(), 0); Queue.queueBlockBreak(e, block.getState(), type, block.getBlockData().getAsString(), 0);

View file

@ -24,7 +24,7 @@ public final class EntityExplodeListener extends Queue implements Listener {
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
protected void onEntityExplode(EntityExplodeEvent event) { protected void onEntityExplode(EntityExplodeEvent event) {
Entity entity = event.getEntity(); 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; return;
} }