Fix def mismatches again

rwmt · Nov 5, 2022 · 13220a2 · 13220a2
1 parent a791c66
commit 13220a2
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Source/Client/EarlyPatches/EarlyPatches.cs b/Source/Client/EarlyPatches/EarlyPatches.cs
@@ -42,7 +42,14 @@ static class XmlAssetsInModFolderPatch
         static void Postfix(LoadableXmlAsset[] __result)
         {
             // This compares by absolute paths but they all have a common prefix
-            Array.Sort(__result, (x, y) => StringComparer.OrdinalIgnoreCase.Compare(x.FullFilePath, y.FullFilePath));
+            // Ignore non-alphanumeric chars (only slashes?) as they might be different between OSes
+            Array.Sort(__result, (x, y) =>
+                StringComparer.OrdinalIgnoreCase.Compare(OnlyAlphanumeric(x.FullFilePath), OnlyAlphanumeric(y.FullFilePath)));
+        }
+
+        static string OnlyAlphanumeric(string str)
+        {
+            return new string(str.Where(char.IsLetterOrDigit).ToArray());
         }
     }