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

fix: Fixes provocation for pre-pub 16 (#1335)

Browse source
This commit is contained in:
Kamron Batman 2023-02-07 23:33:45 -08:00 • committed by GitHub
parent 44c69620a6
commit 3cf6db73f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Projects/UOContent/Engines/Spawners/Commands/ConvertPremiumSpawners.cs
View file

@ -79,7 +79,7 @@ namespace Server.Engines.Spawners
var fullOutputDir = Path.Combine(outputDir, stemDir);
PathUtility.EnsureDirectory(fullOutputDir);
var outputFileName = $"{file.Name[..^file.Extension.Length]}.json";
var outputFileName = $"{file.Name.AsSpan(0, file.Name.Length - file.Extension.Length)}.json";
ParsePremiumSpawnerFile(file.FullName, Path.Combine(fullOutputDir, outputFileName), options);
}
catch (Exception e)
@ -231,13 +231,11 @@ namespace Server.Engines.Spawners
return TimeSpan.MinValue;
}
time = time.ToLowerInvariant();
return time[^1] switch
return char.ToLowerInvariant(time[^1]) switch
{
'h' => TimeSpan.FromHours(double.Parse(time[..^1])),
'm' => TimeSpan.FromMinutes(double.Parse(time[..^1])),
's' => TimeSpan.FromSeconds(double.Parse(time[..^1])),
'h' => TimeSpan.FromHours(double.Parse(time.AsSpan(0, time.Length - 1))),
'm' => TimeSpan.FromMinutes(double.Parse(time.AsSpan(0, time.Length - 1))),
's' => TimeSpan.FromSeconds(double.Parse(time.AsSpan(0, time.Length - 1))),
_ => TimeSpan.FromMinutes(double.Parse(time))
};
}