From f25ad054efa14ba67280d28dc7fc309f8b7c96d8 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 9 May 2021 13:21:59 -0700 Subject: [PATCH] Selectively TrimEnd without extra robust logic TrimEnd has some loops and stuff which isn't necessary for single-char, single-time trims --- PKHeX.Core/Util/ResourceUtil.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/PKHeX.Core/Util/ResourceUtil.cs b/PKHeX.Core/Util/ResourceUtil.cs index 1c6ab7e54..a4376d15e 100644 --- a/PKHeX.Core/Util/ResourceUtil.cs +++ b/PKHeX.Core/Util/ResourceUtil.cs @@ -143,7 +143,14 @@ public static string[] LoadStringList(string file, string? txt) return Array.Empty(); string[] raw = txt.Split('\n'); for (int i = 0; i < raw.Length; i++) - raw[i] = raw[i].TrimEnd('\r'); + { + var line = raw[i]; + if (line.Length == 0) + continue; + var last = line.Length - 1; + if (line[last] == '\r') + raw[i] = line.Substring(0, last); + } lock (getStringListLoadLock) // Make sure only one thread can write to the cache {