From 663d75a179b665db515e149b29402065a71770f2 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 12 Feb 2017 23:48:13 +1100 Subject: [PATCH] ( instead of { for IRC messages --- MCGalaxy/Network/IRCBot.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/MCGalaxy/Network/IRCBot.cs b/MCGalaxy/Network/IRCBot.cs index 2d6f6e1e9..9c96b6b82 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) { @@ -268,12 +268,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)); } } @@ -394,7 +394,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(); @@ -411,7 +411,7 @@ namespace MCGalaxy { } } - Player.GlobalIRCMessage("%I{IRC} " + user.Nick + " %Sis now known as %I" + newNick); + Player.GlobalIRCMessage("%I(IRC) " + user.Nick + " %Sis now known as %I" + newNick); } void Listener_OnNames(string channel, string[] nicks, bool last) { @@ -428,7 +428,7 @@ namespace MCGalaxy { List 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) {