From 1be82111ed9ef4a2826a371deccc9e6e61fe7bf4 Mon Sep 17 00:00:00 2001 From: Intelli Date: Tue, 1 Mar 2022 20:34:12 -0700 Subject: [PATCH] Changed entities killed via /kill command to log under #command --- .../listener/entity/EntityDeathListener.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/coreprotect/listener/entity/EntityDeathListener.java b/src/main/java/net/coreprotect/listener/entity/EntityDeathListener.java index 9d1120e..08209c6 100644 --- a/src/main/java/net/coreprotect/listener/entity/EntityDeathListener.java +++ b/src/main/java/net/coreprotect/listener/entity/EntityDeathListener.java @@ -54,6 +54,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.MerchantRecipe; @@ -113,8 +114,9 @@ public final class EntityDeathListener extends Queue implements Listener { return; } + boolean isCommand = (damage.getCause() == DamageCause.VOID && entity.getLocation().getBlockY() >= BukkitAdapter.ADAPTER.getMinHeight(entity.getWorld())); if (e == null) { - e = ""; + e = isCommand ? "#command" : ""; } boolean skip = true; @@ -194,6 +196,14 @@ public final class EntityDeathListener extends Queue implements Listener { Block block = entityLocation.getBlock(); Queue.queueBlockBreak(e, block.getState(), Material.ARMOR_STAND, null, (int) entityLocation.getYaw()); } + /* + else if (isCommand) { + entityLocation.setY(entityLocation.getY() + 0.99); + Block block = entityLocation.getBlock(); + Database.containerBreakCheck(e, Material.ARMOR_STAND, entity, null, block.getLocation()); + Queue.queueBlockBreak(e, block.getState(), Material.ARMOR_STAND, null, (int) entityLocation.getYaw()); + } + */ return; }