From 2aaf58182cc9b35a9a7e97094ceb91e0334e5bc7 Mon Sep 17 00:00:00 2001 From: Maxetto Date: Wed, 28 Feb 2018 16:18:08 +0100 Subject: [PATCH] Be able to replace sender name in every message Closes #829 --- src/main/java/fr/xephi/authme/message/Messages.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/xephi/authme/message/Messages.java b/src/main/java/fr/xephi/authme/message/Messages.java index 11227aff..9af2a4d6 100644 --- a/src/main/java/fr/xephi/authme/message/Messages.java +++ b/src/main/java/fr/xephi/authme/message/Messages.java @@ -18,6 +18,8 @@ public class Messages { // Custom Authme tag replaced to new line private static final String NEWLINE_TAG = "%nl%"; + private static final String PLAYER_TAG = "%username%"; + /** Contains the keys of the singular messages for time units. */ private static final Map TIME_UNIT_SINGULARS = ImmutableMap.builder() .put(TimeUnit.SECONDS, MessageKey.SECOND) @@ -51,7 +53,7 @@ public class Messages { public void send(CommandSender sender, MessageKey key) { String[] lines = retrieve(key); for (String line : lines) { - sender.sendMessage(line); + sender.sendMessage(line.replace(PLAYER_TAG, sender.getName())); } } @@ -65,7 +67,7 @@ public class Messages { * @param replacements The replacements to apply for the tags */ public void send(CommandSender sender, MessageKey key, String... replacements) { - String message = retrieveSingle(key, replacements); + String message = retrieveSingle(key, replacements).replace(PLAYER_TAG, sender.getName()); for (String line : message.split("\n")) { sender.sendMessage(line); }