PlayerDeathEventListener: fix incorrect placeholder check <due_to>

Flectone · Sep 3, 2023 · d0f468e · d0f468e
1 parent e2e76d4
commit d0f468e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/net/flectone/listeners/PlayerDeathEventListener.java b/src/main/java/net/flectone/listeners/PlayerDeathEventListener.java
@@ -218,7 +218,7 @@ private String formatMessage(String message, Player player, PlayerDamager player
         if (finalBlock != null) message = message
                 .replace("<block>", finalBlock.name());
 
-        if (killer != null) {
+        if (killer != null && finalEntity != null && !killer.getType().equals(finalEntity.getType())) {
             String dueToMessage = locale.getFormatString("death.due-to", null);
             message = message.replace("<due_to>", dueToMessage.replace("<killer>", killer.getName()));
         }