Skip to content

Commit 6959649

Browse files
Fix for lowercase N color code
1 parent e5bfd94 commit 6959649

6 files changed

Lines changed: 10 additions & 13 deletions

File tree

‎fCraft/Commands/WorldCommands.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3080,7 +3080,6 @@ static void SetGreeting(Player player, World world, string value) {
30803080
File.Delete("./WorldGreeting/" + world.Name + ".txt");
30813081
world.Greeting = null;
30823082
} else {
3083-
world.Greeting = value.Replace("%n", "/n");
30843083
player.Message("Greeting message for world {0}&S set to: {1}", world.ClassyName, world.Greeting);
30853084
File.WriteAllText("./WorldGreeting/" + world.Name + ".txt", world.Greeting);
30863085
world.Greeting = null;

‎fCraft/Commands/ZoneCommands.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ static void SignAddHandler(Player player, CommandReader cmd)
272272
{
273273
if (!Directory.Exists("./Signs/")) Directory.CreateDirectory("./Signs/");
274274
if (!Directory.Exists("./Signs/" + player.World.Name + "/")) Directory.CreateDirectory("./Signs/" + player.World.Name + "/");
275-
File.WriteAllText("./Signs/" + player.World.Name + "/" + newZone.Name + ".txt", cmd.NextAll().Replace("%n", "/n"));
275+
File.WriteAllText("./Signs/" + player.World.Name + "/" + newZone.Name + ".txt", cmd.NextAll());
276276
player.Message("Message for sign {0}&S is: {1}", newZone.ClassyName, newZone.Sign);
277277
newZone.Sign = null;
278278
}
@@ -384,7 +384,7 @@ static void ZoneEditHandler( Player player, CommandReader cmd ) {
384384
{
385385
if (!Directory.Exists("./Signs/")) Directory.CreateDirectory("./Signs/");
386386
if (!Directory.Exists("./Signs/" + player.World.Name + "/")) Directory.CreateDirectory("./Signs/" + player.World.Name + "/");
387-
File.WriteAllText("./Signs/" + player.World.Name + "/" + zone.Name + ".txt", cmd.NextAll().Substring(1).Replace("%n", "/n"));
387+
File.WriteAllText("./Signs/" + player.World.Name + "/" + zone.Name + ".txt", cmd.NextAll().Substring(1));
388388
player.Message("Sign Text for zone {0}&S changed to {1}", zone.ClassyName, zone.Sign);
389389
zone.Sign = null;
390390
}

‎fCraft/Network/IRC.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -850,12 +850,12 @@ public static void SendAction([NotNull] string line)
850850
}
851851

852852

853-
static string[] split = new string[] { "&N", "&n", "\n" };
853+
static string[] split = new string[] { "&N", "\n" };
854854
public static void SendRawMessage(string prefix, [NotNull] string line, string suffix)
855855
{
856856
if (line == null) throw new ArgumentNullException("line");
857857
// handle newlines
858-
if (line.Contains("&N") || line.Contains("&n") || line.Contains("\n"))
858+
if (line.Contains("&N") || line.Contains("\n"))
859859
{
860860
string[] segments = line.Split(split, StringSplitOptions.RemoveEmptyEntries);
861861
SendRawMessage(prefix, segments[0], suffix);

‎fCraft/Network/LineWrapper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ bool ProcessChar(byte ch)
250250
if (expectingColor)
251251
{
252252
expectingColor = false;
253-
if (ch == 'N' || ch == 'n')
253+
if (ch == 'N')
254254
{
255255
// newline
256256
inputIndex++;

‎fCraft/Player/Chat.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -561,14 +561,13 @@ static bool SendInternal([NotNull] ChatSendingEventArgs e)
561561
return true;
562562
}
563563

564-
/// <summary> Replaces newline codes (&amp;n and &amp;N) with actual newlines (\n). </summary>
564+
/// <summary> Replaces newline codes (&amp;N) with actual newlines (\n). </summary>
565565
/// <param name="message"> Message to process. </param>
566566
/// <returns> Processed message. </returns>
567567
/// <exception cref="ArgumentNullException"> message is null. </exception>
568568
[NotNull, Pure]
569569
public static string ReplaceNewlines( [NotNull] string message ) {
570570
if( message == null ) throw new ArgumentNullException( "message" );
571-
message = message.Replace( "&n", "\n" );
572571
message = message.Replace( "&N", "\n" );
573572
return message;
574573
}
@@ -812,7 +811,7 @@ static void RaiseSentEvent(ChatSendingEventArgs args, int count)
812811
{"grave", '`'}, {"'", '`'}
813812
};
814813

815-
/// <summary> Removes newlines (\n) and newline codes (&amp;n and &amp;N). </summary>
814+
/// <summary> Removes newlines (\n) and newline codes (&amp;N). </summary>
816815
/// <param name="message"> Message to process. </param>
817816
/// <returns> Processed message. </returns>
818817
/// <exception cref="ArgumentNullException"> message is null. </exception>
@@ -821,7 +820,6 @@ public static string StripNewlines([NotNull] string message)
821820
{
822821
if (message == null) throw new ArgumentNullException("message");
823822
message = message.Replace("\n", "");
824-
message = message.Replace("&n", "");
825823
message = message.Replace("&N", "");
826824
return message;
827825
}
@@ -931,7 +929,7 @@ public static string ReplacePercentColorCodes([NotNull] string message, bool all
931929
}
932930
// extract the colorcode
933931
char colorCode = message[startIndex + 1];
934-
if (Color.IsColorCode(colorCode) || allowNewlines && (colorCode == 'n' || colorCode == 'N'))
932+
if (Color.IsColorCode(colorCode) || allowNewlines && colorCode == 'N')
935933
{
936934
if (escaped)
937935
{

‎fCraft/System/Logger.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ internal static void MarkLogStart() {
7474
}
7575

7676

77-
static string[] split = new string[] { "&N", "&n" };
77+
static string[] split = new string[] { "&N" };
7878
/// <summary> Logs a message of type ConsoleOutput, strips colors,
7979
/// and splits into multiple messages at newlines.
8080
/// Use this method for all messages of LogType.ConsoleOutput </summary>
8181
public static void LogToConsole( [NotNull] string message ) {
8282
if( message == null ) throw new ArgumentNullException( "message" );
83-
if( message.Contains( "&N" ) || message.Contains( "&n" ) ) {
83+
if( message.Contains( "&N" ) ) {
8484
foreach( string line in message.Split( split,
8585
StringSplitOptions.RemoveEmptyEntries ) ) {
8686
LogToConsole( line );

0 commit comments

Comments
 (0)