Fallback to %killer% if the killer is not player when using `%kille…

…r_display%`
Winds-Studio · Feb 8, 2025 · 32c2f3a · 32c2f3a
1 parent cc81481
commit 32c2f3a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/DeathMessagesLegacy/src/main/java/dev/mrshawn/deathmessages/utils/Assets.java b/DeathMessagesLegacy/src/main/java/dev/mrshawn/deathmessages/utils/Assets.java
@@ -1002,6 +1002,8 @@ public static Component playerDeathPlaceholders(Component msg, PlayerManager pm,
             if (mob instanceof Player) {
                 Player p = (Player) mob;
                 msg = msg.replaceText(Util.replace("%killer_display%", Util.getPlayerDisplayName(p)));
+            } else {
+                msg = msg.replaceText(Util.replace("%killer_display%", mobName)); // Fallback to mob name if not player
             }
         }
 
@@ -1070,6 +1072,8 @@ public static String playerDeathPlaceholders(String msg, PlayerManager pm, Entit
             if (mob instanceof Player) {
                 Player p = (Player) mob;
                 msg = msg.replaceAll("%killer_display%", Util.getPlayerDisplayName(p));
+            } else {
+                msg = msg.replaceAll("%killer_display%", mobName); // Fallback to mob name if not player
             }
         }
 

diff --git a/DeathMessagesModern/src/main/java/dev/mrshawn/deathmessages/utils/Assets.java b/DeathMessagesModern/src/main/java/dev/mrshawn/deathmessages/utils/Assets.java
@@ -986,6 +986,8 @@ public static Component playerDeathPlaceholders(Component msg, PlayerManager pm,
             if (mob instanceof Player) {
                 Player p = (Player) mob;
                 msg = msg.replaceText(Util.replace("%killer_display%", Util.getPlayerDisplayNameComponent(p)));
+            } else {
+                msg = msg.replaceText(Util.replace("%killer_display%", mobName)); // Fallback to mob name if not player
             }
         }
 
@@ -1054,6 +1056,8 @@ public static String playerDeathPlaceholders(String msg, PlayerManager pm, Entit
             if (mob instanceof Player) {
                 Player p = (Player) mob;
                 msg = msg.replaceAll("%killer_display%", Util.getPlayerDisplayName(p));
+            } else {
+                msg = msg.replaceAll("%killer_display%", mobName); // Fallback to mob name if not player
             }
         }