From 9364b3847fed5529cde9df7ee45aaa82ba4f11a4 Mon Sep 17 00:00:00 2001
From: cnaude <cnaude@zebra.lan>
Date: Sat, 19 Nov 2016 17:02:57 -0700
Subject: [PATCH] Add %NICK% to irc-a-response

---
 src/main/java/com/cnaude/purpleirc/IRCMessageHandler.java     | 2 +-
 .../java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/cnaude/purpleirc/IRCMessageHandler.java b/src/main/java/com/cnaude/purpleirc/IRCMessageHandler.java
index 8c8b19d..717bfd3 100644
--- a/src/main/java/com/cnaude/purpleirc/IRCMessageHandler.java
+++ b/src/main/java/com/cnaude/purpleirc/IRCMessageHandler.java
@@ -217,7 +217,7 @@ public class IRCMessageHandler {
                                     String newMessage = ircBot.filterMessage(
                                             plugin.tokenizer.ircChatToGameTokenizer(ircBot, user, channel, plugin.getMessageTemplate(ircBot.botNick, channelName, TemplateName.IRC_ADMIN_CHAT), commandArgs), channelName);
                                     plugin.adminPrivateChatHook.sendMessage(newMessage, user.getNick());
-                                    String acResponse = plugin.tokenizer.msgChatResponseTokenizer(target, commandArgs, plugin.getMessageTemplate(TemplateName.IRC_ADMIN_RESPONSE));
+                                    String acResponse = plugin.tokenizer.msgChatResponseTokenizer(user.getNick(), target, commandArgs, plugin.getMessageTemplate(TemplateName.IRC_ADMIN_RESPONSE));
                                     if (!acResponse.isEmpty()) {
                                         sendMessage(ircBot, target, acResponse, responseType);
                                     }
diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
index 3c9179e..7cdad43 100644
--- a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
+++ b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
@@ -1096,13 +1096,15 @@ public class ChatTokenizer {
 
     /**
      *
+     * @param nick
      * @param target
      * @param message
      * @param template
      * @return
      */
-    public String msgChatResponseTokenizer(String target, String message, String template) {
+    public String msgChatResponseTokenizer(String nick, String target, String message, String template) {
         return plugin.colorConverter.ircColorsToGame(template
+                .replace("%NICK%", nick)
                 .replace("%TARGET%", target)
                 .replace("%MESSAGE%", message)
         );