From 1f81ed9f70bf968f3f25827dcc522c902dc22303 Mon Sep 17 00:00:00 2001 From: cnaude Date: Wed, 24 Jun 2015 20:13:40 -0700 Subject: [PATCH] Tokenize smsg response correctly. --- src/main/java/com/cnaude/purpleirc/Commands/SMsg.java | 2 +- .../java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cnaude/purpleirc/Commands/SMsg.java b/src/main/java/com/cnaude/purpleirc/Commands/SMsg.java index ce67223..8b6e5a5 100644 --- a/src/main/java/com/cnaude/purpleirc/Commands/SMsg.java +++ b/src/main/java/com/cnaude/purpleirc/Commands/SMsg.java @@ -82,7 +82,7 @@ public void dispatch(CommandSender sender, String[] args) { String targetMsg = plugin.tokenizer.gameChatTokenizer(player, template, msg); String responseTemplate = plugin.getMsgTemplate("MAIN", "", TemplateName.GAME_PCHAT_RESPONSE); if (!responseTemplate.isEmpty()) { - String responseMsg = plugin.tokenizer.msgChatResponseTokenizer(player.getName(), responseTemplate, msg); + String responseMsg = plugin.tokenizer.msgChatResponseTokenizer(player, msg, responseTemplate); sender.sendMessage(responseMsg); } plugin.logDebug("Tokenized message: " + targetMsg); diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java index 2ff6b27..0a18e86 100644 --- a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java +++ b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java @@ -761,4 +761,10 @@ public String msgChatResponseTokenizer(String target, String message, String tem .replace("%MESSAGE%", message) ); } + + public String msgChatResponseTokenizer(Player player, String message, String template) { + return template + .replace("%TARGET%", player.getName()) + .replace("%MESSAGE%", message); + } }