jussi/DotTiled
1
0
Fork 0
mirror of https://github.com/dcronqvist/DotTiled.git synced 2025-05-08 18:26:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

TryParse on empty color string now returns null

Browse source 
Moved exception into Parse in the case of a string greater than 1 character ("#")
This commit is contained in:
differenceclouds 2024-11-14 09:32:22 -05:00
parent d943a8d8b7
commit e8fa9cd983
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/DotTiled/Color.cs
View file

@ -40,7 +40,7 @@ public class Color : IParsable<Color>, IEquatable<Color>
public static Color Parse(string s, IFormatProvider provider) public static Color Parse(string s, IFormatProvider provider)
{ {
_ = TryParse(s, provider, out var result); _ = TryParse(s, provider, out var result);
return result ?? throw new FormatException($"Invalid format for TiledColor: {s}"); return result;
} }
/// <summary> /// <summary>
@ -62,6 +62,10 @@ public class Color : IParsable<Color>, IEquatable<Color>
// Format: #RRGGBB or #AARRGGBB // Format: #RRGGBB or #AARRGGBB
if (s is null || (s.Length != 7 && s.Length != 9) || s[0] != '#') if (s is null || (s.Length != 7 && s.Length != 9) || s[0] != '#')
{ {
if(s.Length > 1)
{
throw new FormatException($"Invalid format for TiledColor: {s}");
}
result = default; result = default;
return false; return false;
} }