Tokenize smsg response correctly.

cnaude · Jun 25, 2015 · 1f81ed9 · 1f81ed9
1 parent f998a7f
commit 1f81ed9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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);
+    }
 }