Replaced the names by the display names in the death messages.

zDevelopers · Jan 4, 2015 · 95a0a06 · 95a0a06
1 parent 16337c7
commit 95a0a06
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/me/azenet/UHPlugin/listeners/UHGameListener.java b/src/main/java/me/azenet/UHPlugin/listeners/UHGameListener.java
@@ -209,7 +209,13 @@ public void run() {
 		p.getServer().getConsoleSender().sendMessage(ChatColor.GOLD + "-- Death of " + ev.getEntity().getDisplayName() + ChatColor.GOLD + " (" + ev.getDeathMessage() + ") --");
 
 		// Customizes the death message
-		ev.setDeathMessage(ChatColor.translateAlternateColorCodes('&', p.getConfig().getString("death.messages.deathMessagesFormat", "")) + ev.getDeathMessage());
+		String dmFormat = ChatColor.translateAlternateColorCodes('&', p.getConfig().getString("death.messages.deathMessagesFormat", ""));
+		String deathMessage = dmFormat + ev.getDeathMessage();
+		deathMessage = deathMessage.replace(ev.getEntity().getName(), ev.getEntity().getDisplayName() + dmFormat);
+		if(ev.getEntity().getKiller() != null) {
+			deathMessage = deathMessage.replace(ev.getEntity().getKiller().getName(), ev.getEntity().getKiller().getDisplayName() + dmFormat);
+		}
+		ev.setDeathMessage(deathMessage);
 
 		// Saves the location of the death
 		p.getGameManager().addDeathLocation(ev.getEntity(), ev.getEntity().getLocation());