diff --git a/Commands/Information/WhoInfo.cs b/Commands/Information/WhoInfo.cs index bc0037ea9..1ea98f09a 100644 --- a/Commands/Information/WhoInfo.cs +++ b/Commands/Information/WhoInfo.cs @@ -40,7 +40,7 @@ namespace MCGalaxy.Commands { Player.Message(p, ">> &a" + who.Deaths + " &cdeaths%S, &a" + who.Money + " %S" + Server.moneys +", " + Awards.AwardAmount(who.Name) + " awards"); else - Player.Message(p, ">> &a" + who.Deaths + " &cdeaths%s, " + Awards.AwardAmount(who.Name) + " awards"); + Player.Message(p, ">> &a" + who.Deaths + " &cdeaths%S, " + Awards.AwardAmount(who.Name) + " awards"); if (who.LoginBlocks >= 0) Player.Message(p, ">> &bModified &a" + who.TotalBlocks + " &eblocks, &a" + who.LoginBlocks + " &esince login"); diff --git a/Commands/Moderation/CmdTempRankInfo.cs b/Commands/Moderation/CmdTempRankInfo.cs index 24f949e95..eb3ac8f0a 100644 --- a/Commands/Moderation/CmdTempRankInfo.cs +++ b/Commands/Moderation/CmdTempRankInfo.cs @@ -49,8 +49,8 @@ namespace MCGalaxy.Commands { DateTime assignmentDate = new DateTime(years, months, days, hours, minutes, 0); DateTime expireDate = assignmentDate.AddHours(Convert.ToDouble(period)); Player.Message(p, "%STemp rank information for " + args[0] + ":"); - Player.Message(p, "%sFrom " + oldCol + oldrank + " %sto " - + tempCol + temprank + "%s, by " + tempranker); + Player.Message(p, "%SFrom " + oldCol + oldrank + " %Sto " + + tempCol + temprank + "%S, by " + tempranker); Player.Message(p, "&SRanked on &a" + assignmentDate.ToString() + "%S, expires &a" + expireDate.ToString()); } diff --git a/Games/ZombieSurvival/ZombieGame.Core.cs b/Games/ZombieSurvival/ZombieGame.Core.cs index 2aea05715..d0d46b3d3 100644 --- a/Games/ZombieSurvival/ZombieGame.Core.cs +++ b/Games/ZombieSurvival/ZombieGame.Core.cs @@ -355,7 +355,7 @@ namespace MCGalaxy.Games { foreach (Player pl in alive) { if (pl.Game.PledgeSurvive) { pl.SendMessage("You received &a5 %3" + Server.moneys + - "%s for successfully pledging that you would survive."); + "%S for successfully pledging that you would survive."); pl.money += 5; pl.OnMoneyChanged(); } diff --git a/IRC/ForgeBot.cs b/IRC/ForgeBot.cs index 3ddd2818c..a3606250b 100644 --- a/IRC/ForgeBot.cs +++ b/IRC/ForgeBot.cs @@ -114,7 +114,7 @@ namespace MCGalaxy { message = CP437Writer.ConvertToUnicode(message); if (color) - message = Colors.MinecraftToIrcColors(message.Replace("%r", ResetSignal)); + message = Colors.MinecraftToIrcColors(message.Replace("%S", ResetSignal)); return message; } @@ -170,15 +170,15 @@ namespace MCGalaxy { if (!Server.irc || !IsConnected()) return; string msg = null; if (action == PlayerAction.AFK) - msg = p.ColoredName + " %ris AFK " + message; + msg = p.ColoredName + " %Sis AFK " + message; else if (action == PlayerAction.UnAFK) - msg = p.ColoredName + " %ris no longer AFK"; + msg = p.ColoredName + " %Sis no longer AFK"; else if (action == PlayerAction.Joker) - msg = p.ColoredName + " %ris now a &aJ&bo&ck&5e&9r%S"; + msg = p.ColoredName + " %Sis now a &aJ&bo&ck&5e&9r%S"; else if (action == PlayerAction.Unjoker) - msg = p.ColoredName + " %ris no longer a &aJ&bo&ck&5e&9r%S"; + msg = p.ColoredName + " %Sis no longer a &aJ&bo&ck&5e&9r%S"; else if (action == PlayerAction.JoinWorld) - msg = p.ColoredName + " %rwent to &8" + message; + msg = p.ColoredName + " %Swent to &8" + message; else if (action == PlayerAction.Me) msg = "*" + p.DisplayName + " " + message; @@ -190,7 +190,7 @@ namespace MCGalaxy { if (!Server.irc || !IsConnected()) return; if (!Server.guestLeaveNotify && p.group.Permission <= LevelPermission.Guest) return; - string msg = p.DisplayName + " %rleft the game (" + reason + ")"; + string msg = p.DisplayName + " %Sleft the game (" + reason + ")"; msg = ConvertMessage(msg, true); if (!p.hidden) connection.Sender.PublicMessage(channel, msg); } @@ -199,7 +199,7 @@ namespace MCGalaxy { if (!Server.irc || !IsConnected()) return; if (!Server.guestJoinNotify && p.group.Permission <= LevelPermission.Guest) return; - string msg = p.DisplayName + " %rjoined the game"; + string msg = p.DisplayName + " %Sjoined the game"; msg = ConvertMessage(msg, true); if (!p.hidden) connection.Sender.PublicMessage(channel, msg); } @@ -211,11 +211,9 @@ namespace MCGalaxy { } if (Server.ircColorsEnable && Server.irc && IsConnected()) - Say(p.FullName + "%r: " + message, p.opchat); + Say(p.FullName + "%S: " + message, p.opchat); if (!Server.ircColorsEnable && Server.irc && IsConnected()) - { Say(p.DisplayName + ": " + message, p.opchat); - } } #endregion diff --git a/Player/Player.cs b/Player/Player.cs index a0fae3724..2c4ce94b6 100644 --- a/Player/Player.cs +++ b/Player/Player.cs @@ -450,7 +450,7 @@ namespace MCGalaxy { Last50Chat.Add(chatmessage); if (showname) - message = from.voicestring + from.color + from.prefix + from.DisplayName + ": %r&f" + message; + message = from.voicestring + from.color + from.prefix + from.DisplayName + ": &f" + message; Player[] players = PlayerInfo.Online.Items; foreach (Player p in players) { diff --git a/Server/Colors.cs b/Server/Colors.cs index f0a017aee..151fe9b5d 100644 --- a/Server/Colors.cs +++ b/Server/Colors.cs @@ -171,8 +171,7 @@ namespace MCGalaxy { if (color == 'h' || color == 'H') { color = Server.HelpDescriptionColor[1]; return true; } if (color == 't' || color == 'T') { color = Server.HelpSyntaxColor[1]; return true; } if (color == 'i' || color == 'I') { color = Server.IRCColour[1]; return true; } - if (color == 'g' || color == 'G') { color = Server.GlobalChatColor[1]; return true; } - if (color == 'r' || color == 'R') { color = 'f'; return true; } + if (color == 'g' || color == 'G') { color = Server.GlobalChatColor[1]; return true; } return Colors.GetFallback(color) != '\0'; }