From 6e05af1be6b0d96199b30ef048d5d658323b2ceb Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Fri, 15 Jul 2016 12:32:42 +1000 Subject: [PATCH] Fix kicker/kickee in IRC messages (thanks 123DMWM), remove 'has' from leave/join IRC messages. --- IRC/ForgeBot.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/IRC/ForgeBot.cs b/IRC/ForgeBot.cs index 5c5724373..f6cd88d09 100644 --- a/IRC/ForgeBot.cs +++ b/IRC/ForgeBot.cs @@ -241,9 +241,9 @@ namespace MCGalaxy { } void DoJoinLeaveMessage(string who, string verb, string channel) { - Server.s.Log(String.Format("{0} has {1} channel {2}", who, verb, 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} has {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) { @@ -252,8 +252,8 @@ namespace MCGalaxy { RemoveNick(user.Nick); if (user.Nick == nick) return; - Server.s.Log(user.Nick + " has left IRC"); - Player.GlobalIRCMessage("%I[IRC] " + user.Nick + " has left"); + Server.s.Log(user.Nick + " left IRC"); + Player.GlobalIRCMessage("%I[IRC] " + user.Nick + " left"); } void Listener_OnError(ReplyCode code, string message) { @@ -467,8 +467,8 @@ namespace MCGalaxy { void Listener_OnKick(UserInfo user, string channel, string kickee, string reason) { List chanNicks = GetNicks(channel); RemoveNick(user.Nick, chanNicks); - Server.s.Log(kickee + " kicked " + user.Nick + " from IRC"); - Player.GlobalIRCMessage("%I[IRC] " + kickee + " kicked " + user.Nick); + Server.s.Log(user.Nick + " kicked " + kickee + " from IRC"); + Player.GlobalIRCMessage("%I[IRC] " + user.Nick + " kicked " + kickee); } void Listener_OnKill(UserInfo user, string nick, string reason) {