From 8700a78a502c54a10bc6e277a3235390ac7104d8 Mon Sep 17 00:00:00 2001
From: Goodlyay <zackxv7@yahoo.com>
Date: Sat, 14 Jan 2017 20:12:02 -0800
Subject: [PATCH] Make IRC distinct from /title

---
 MCGalaxy/Network/IRCBot.cs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/MCGalaxy/Network/IRCBot.cs b/MCGalaxy/Network/IRCBot.cs
index b28bd8f4c..d26175087 100644
--- a/MCGalaxy/Network/IRCBot.cs
+++ b/MCGalaxy/Network/IRCBot.cs
@@ -200,7 +200,7 @@ namespace MCGalaxy {
         #region IRC event handlers
         
         void Listener_OnAction(UserInfo user, string channel, string description) {
-            Player.GlobalIRCMessage(String.Format("%I[IRC] * {0} {1}", user.Nick, description));
+            Player.GlobalIRCMessage(String.Format("%I{IRC} * {0} {1}", user.Nick, description));
         }
         
         void Listener_OnJoin(UserInfo user, string channel) {
@@ -218,7 +218,7 @@ namespace MCGalaxy {
         void DoJoinLeaveMessage(string who, string verb, string channel) {
             Server.s.Log(String.Format("{0} {1} channel {2}", who, verb, channel));
             string which = channel.CaselessEq(opchannel) ? " operator" : "";
-            Player.GlobalIRCMessage(String.Format("%I[IRC] {0} {1} the{2} channel", who, verb, which));
+            Player.GlobalIRCMessage(String.Format("%I{IRC} {0} {1} the{2} channel", who, verb, which));
         }
 
         void Listener_OnQuit(UserInfo user, string reason) {
@@ -228,7 +228,7 @@ namespace MCGalaxy {
             RemoveNick(user.Nick);
             if (user.Nick == nick) return;
             Server.s.Log(user.Nick + " left IRC");
-            Player.GlobalIRCMessage("%I[IRC] " + user.Nick + " left");
+            Player.GlobalIRCMessage("%I{IRC} " + user.Nick + " left");
         }
 
         void Listener_OnError(ReplyCode code, string message) {
@@ -270,12 +270,12 @@ namespace MCGalaxy {
             if (ircCmd == ".x" && !HandlePublicCommand(user, channel, message, parts, opchat)) return;
 
             if (channel.CaselessEq(opchannel)) {
-                Server.s.Log(String.Format("(OPs): [IRC] {0}: {1}", user.Nick, message));
-                Chat.MessageOps(String.Format("To Ops &f-%I[IRC] {0}&f- {1}", user.Nick,
+                Server.s.Log(String.Format("(OPs): {IRC} {0}: {1}", user.Nick, message));
+                Chat.MessageOps(String.Format("To Ops &f-%I{IRC} {0}&f- {1}", user.Nick,
                                               Server.profanityFilter ? ProfanityFilter.Parse(message) : message));
             } else {
-                Server.s.Log(String.Format("[IRC] {0}: {1}", user.Nick, message));
-                Player.GlobalIRCMessage(String.Format("%I[IRC] {0}: &f{1}", user.Nick,
+                Server.s.Log(String.Format("{IRC} {0}: {1}", user.Nick, message));
+                Player.GlobalIRCMessage(String.Format("%I{IRC} {0}: &f{1}", user.Nick,
                                                       Server.profanityFilter ? ProfanityFilter.Parse(message) : message));
             }
         }
@@ -396,7 +396,7 @@ namespace MCGalaxy {
         }
 
         void Listener_OnNick(UserInfo user, string newNick) {
-            //Player.GlobalMessage(Server.IRCColour + "[IRC] " + user.Nick + " changed nick to " + newNick);
+            //Player.GlobalMessage(Server.IRCColour + "{IRC} " + user.Nick + " changed nick to " + newNick);
             // We have successfully reclaimed our nick, so try to sign in again.
             if (newNick == nick) Authenticate();
 
@@ -419,16 +419,16 @@ namespace MCGalaxy {
                 if (key != null && key != "") {
                     switch (key) {
                         case "AFK":
-                            Player.GlobalIRCMessage("%I[IRC] " + user.Nick + " %Sis AFK"); Server.ircafkset.Add(user.Nick); break;
+                            Player.GlobalIRCMessage("%I{IRC} " + user.Nick + " %Sis AFK"); Server.ircafkset.Add(user.Nick); break;
                         case "Away":
-                            Player.GlobalIRCMessage("%I[IRC] " + user.Nick + " %Sis Away"); Server.ircafkset.Add(user.Nick); break;
+                            Player.GlobalIRCMessage("%I{IRC} " + user.Nick + " %Sis Away"); Server.ircafkset.Add(user.Nick); break;
                     }
                 }
             } else if (Server.ircafkset.Contains(newNick)) {
-                Player.GlobalIRCMessage("%I[IRC] " + newNick + " %Sis back");
+                Player.GlobalIRCMessage("%I{IRC} " + newNick + " %Sis back");
                 Server.ircafkset.Remove(newNick);
             } else {
-                Player.GlobalIRCMessage("%I[IRC] " + user.Nick + " %Sis now known as %I" + newNick);
+                Player.GlobalIRCMessage("%I{IRC} " + user.Nick + " %Sis now known as %I" + newNick);
             }
         }
         
@@ -446,7 +446,7 @@ namespace MCGalaxy {
             List<string> chanNicks = GetNicks(channel);
             RemoveNick(user.Nick, chanNicks);
             Server.s.Log(user.Nick + " kicked " + kickee + " from IRC");
-            Player.GlobalIRCMessage("%I[IRC] " + user.Nick + " kicked " + kickee);
+            Player.GlobalIRCMessage("%I{IRC} " + user.Nick + " kicked " + kickee);
         }
         
         void Listener_OnKill(UserInfo user, string nick, string reason) {