From b916d80725dc1c175070854047d7f868afe6064c Mon Sep 17 00:00:00 2001
From: axieum <7577851+axieum@users.noreply.github.com>
Date: Sat, 28 Aug 2021 12:26:40 +1000
Subject: [PATCH] fix(chat): filter named entity death messages

---
 .../impl/chat/callback/minecraft/EntityDeathCallback.java      | 3 +++
 .../me/axieum/mcmod/minecord/impl/chat/config/ChatConfig.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/minecord-chat/src/main/java/me/axieum/mcmod/minecord/impl/chat/callback/minecraft/EntityDeathCallback.java b/minecord-chat/src/main/java/me/axieum/mcmod/minecord/impl/chat/callback/minecraft/EntityDeathCallback.java
index dae6ae9..92c3b22 100644
--- a/minecord-chat/src/main/java/me/axieum/mcmod/minecord/impl/chat/callback/minecraft/EntityDeathCallback.java
+++ b/minecord-chat/src/main/java/me/axieum/mcmod/minecord/impl/chat/callback/minecraft/EntityDeathCallback.java
@@ -16,6 +16,9 @@ public class EntityDeathCallback implements EntityDeathEvents.Entity
     @Override
     public void onEntityDeath(LivingEntity entity, DamageSource source)
     {
+        // Only listen for named animal/monsters (with a name tag)
+        if (!entity.hasCustomName()) return;
+
         Minecord.getInstance().getJDA().ifPresent(jda -> {
             final String entityName = entity.getDisplayName().getString();
 
diff --git a/minecord-chat/src/main/java/me/axieum/mcmod/minecord/impl/chat/config/ChatConfig.java b/minecord-chat/src/main/java/me/axieum/mcmod/minecord/impl/chat/config/ChatConfig.java
index fb72932..c8a8c44 100644
--- a/minecord-chat/src/main/java/me/axieum/mcmod/minecord/impl/chat/config/ChatConfig.java
+++ b/minecord-chat/src/main/java/me/axieum/mcmod/minecord/impl/chat/config/ChatConfig.java
@@ -45,7 +45,7 @@ public static class Discord
             @Comment("""
                 A player had died
                 Usages: ${username}, ${player}, ${cause}, ${world}, ${x}, ${y}, ${z}, ${score} and ${exp}""")
-            public String death = "**${player}** ${cause}!\n:skull: _${world} | ${x}, ${y}, ${z}_";
+            public String death = "**${player}** ${cause}! :skull:\n_${world} | ${x}, ${y}, ${z}_";
 
             @Comment("""
                 A named animal/monster (with name tag) had died