From 3742e018c49dacff4d5c640667125b5cc30091dd Mon Sep 17 00:00:00 2001 From: Intelli Date: Mon, 4 Oct 2021 16:09:08 -0600 Subject: [PATCH] Minor readability improvements in EntityDamageByBlockListener --- .../entity/EntityDamageByBlockListener.java | 65 ++++++++++--------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/src/main/java/net/coreprotect/listener/entity/EntityDamageByBlockListener.java b/src/main/java/net/coreprotect/listener/entity/EntityDamageByBlockListener.java index 94ddd73..19e975c 100644 --- a/src/main/java/net/coreprotect/listener/entity/EntityDamageByBlockListener.java +++ b/src/main/java/net/coreprotect/listener/entity/EntityDamageByBlockListener.java @@ -23,37 +23,44 @@ public final class EntityDamageByBlockListener extends Queue implements Listener @EventHandler(priority = EventPriority.MONITOR) protected void onEntityDamageByBlock(EntityDamageByBlockEvent event) { - Block damager = event.getDamager(); - if (event.getEntity() instanceof ItemFrame || event.getEntity() instanceof ArmorStand || event.getEntity() instanceof EnderCrystal) { - if (damager != null && damager.getType() != Material.MAGMA_BLOCK) { - final Entity entity = event.getEntity(); - Block block = entity.getLocation().getBlock(); - String user = "#" + damager.getType().name().toLowerCase(Locale.ROOT); - if (user.contains("tnt")) { - user = "#tnt"; - } + Entity entity = event.getEntity(); + if (!(entity instanceof ItemFrame) && !(entity instanceof ArmorStand) && !(entity instanceof EnderCrystal)) { + return; + } - if (!event.isCancelled() && Config.getConfig(entity.getWorld()).BLOCK_BREAK) { - if (entity instanceof ItemFrame) { - Material frameType = BukkitAdapter.ADAPTER.getFrameType(entity); - ItemFrame frame = (ItemFrame) event.getEntity(); - int data = 0; - if (frame.getItem() != null) { - data = Util.getBlockId(frame.getItem().getType()); - } - Queue.queueBlockBreak(user, block.getState(), frameType, null, data); - Queue.queueBlockPlace(user, block.getState(), frameType, null, frameType, -1, 0, null); - } - else if (entity instanceof ArmorStand) { - Database.containerBreakCheck(user, Material.ARMOR_STAND, entity, null, block.getLocation()); - Queue.queueBlockBreak(user, block.getState(), Material.ARMOR_STAND, null, (int) entity.getLocation().getYaw()); - } - else if (entity instanceof EnderCrystal) { - EnderCrystal crystal = (EnderCrystal) event.getEntity(); - Queue.queueBlockBreak(user, block.getState(), Material.END_CRYSTAL, null, crystal.isShowingBottom() ? 1 : 0); - } - } + Block damager = event.getDamager(); + if (damager == null || damager.getType() == Material.MAGMA_BLOCK) { + return; + } + + if (event.isCancelled() || !Config.getConfig(entity.getWorld()).BLOCK_BREAK) { + return; + } + + Block block = entity.getLocation().getBlock(); + String user = "#" + damager.getType().name().toLowerCase(Locale.ROOT); + if (user.contains("tnt")) { + user = "#tnt"; + } + + if (entity instanceof ItemFrame) { + Material frameType = BukkitAdapter.ADAPTER.getFrameType(entity); + ItemFrame frame = (ItemFrame) event.getEntity(); + int data = 0; + if (frame.getItem() != null) { + data = Util.getBlockId(frame.getItem().getType()); } + + Queue.queueBlockBreak(user, block.getState(), frameType, null, data); + Queue.queueBlockPlace(user, block.getState(), frameType, null, frameType, -1, 0, null); + } + else if (entity instanceof ArmorStand) { + Database.containerBreakCheck(user, Material.ARMOR_STAND, entity, null, block.getLocation()); + Queue.queueBlockBreak(user, block.getState(), Material.ARMOR_STAND, null, (int) entity.getLocation().getYaw()); + } + else if (entity instanceof EnderCrystal) { + EnderCrystal crystal = (EnderCrystal) event.getEntity(); + Queue.queueBlockBreak(user, block.getState(), Material.END_CRYSTAL, null, crystal.isShowingBottom() ? 1 : 0); } }