warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Adds ISpanParsable and fixes command conditionals (#1241)

Browse source 
* Adds `ISpanParsable<T>`
* Removes `[Parsable]`
* Fixes querying by serial, body, and a few others.
* Adds `Parse` to `Rectangle3D`
* Fixes AutoArchive NPE


Closes #1209
This commit is contained in:
Kamron Batman 2022-11-12 00:26:02 -08:00 • committed by GitHub
parent d494a9c78c
commit 03fb36c869
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 1119 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

56
Projects/Server/Poison.cs
View file

@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
namespace Server;
[Parsable]
public abstract class Poison
public abstract class Poison : ISpanParsable<Poison>
{
/*public abstract TimeSpan Interval{ get; }
public abstract TimeSpan Duration{ get; }*/
@ -44,9 +44,6 @@ public abstract class Poison
Poisons.Add(reg);
}
public static Poison Parse(string value) =>
(int.TryParse(value, out var plevel) ? GetPoison(plevel) : null) ?? GetPoison(value);
public static Poison GetPoison(int level)
{
for (var i = 0; i < Poisons.Count; ++i)
@ -62,13 +59,13 @@ public abstract class Poison
return null;
}
public static Poison GetPoison(string name)
public static Poison GetPoison(ReadOnlySpan<char> name)
{
for (var i = 0; i < Poisons.Count; ++i)
{
var p = Poisons[i];
if (Utility.InsensitiveCompare(p.Name, name) == 0)
if (name.InsensitiveEquals(p.Name))
{
return p;
}
@ -76,4 +73,49 @@ public abstract class Poison
return null;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Poison Parse(string s) => Parse(s, null);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Poison Parse(string s, IFormatProvider provider) => Parse(s.AsSpan(), provider);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool TryParse(string s, IFormatProvider provider, out Poison result) =>
TryParse(s.AsSpan(), provider, out result);
public static Poison Parse(ReadOnlySpan<char> s, IFormatProvider provider)
{
if (int.TryParse(s, provider, out var pLevel))
{
var result = GetPoison(pLevel);
if (result != null)
{
return result;
}
}
var poison = GetPoison(s.Trim());
if (poison == null)
{
throw new FormatException($"The input string '{s}' was not in a correct format.");
}
return poison;
}
public static bool TryParse(ReadOnlySpan<char> s, IFormatProvider provider, out Poison result)
{
if (int.TryParse(s, provider, out var pLevel))
{
result = GetPoison(pLevel);
if (result != null)
{
return true;
}
}
result = GetPoison(s.Trim());
return result != null;
}
}