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

Cleanup & Fixes for .NET 5 (#309)

Browse source 
- [X] Fixes several bugs
- [X] Updates more ordinal issues
- [X] Cleans up the code a bit
- [X] Turns classes static that should have been
- [X] Changes TcpServer.Instances to a HashSet

Bumps release version
This commit is contained in:
Kamron Batman 2020-11-15 10:03:50 -08:00 • committed by GitHub
parent 4ad8811df2
commit 525cda5413
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
266 changed files with 1348 additions and 1800 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/UOContent/Gumps/Props/PropsConfig.cs
View file

@ -1,6 +1,6 @@
namespace Server.Gumps
{
public class PropsConfig
public static class PropsConfig
{
public static readonly bool OldStyle = false;
@ -13,7 +13,7 @@ namespace Server.Gumps
public static readonly int OffsetGumpID = 0x0A40; // Pure black
public static readonly int
HeaderGumpID = OldStyle ? 0x0BBC : 0x0E14; // Light offwhite, textured : Dark navy blue, textured
HeaderGumpID = OldStyle ? 0x0BBC : 0x0E14; // Light off-white, textured : Dark navy blue, textured
public static readonly int EntryGumpID = 0x0BBC; // Light offwhite, textured
public static readonly int BackGumpID = 0x13BE; // Gray slate/stoney

2
Projects/UOContent/Gumps/Props/PropsGump.cs
View file

@ -757,7 +757,7 @@ namespace Server.Gumps
if (t == typeof(byte) || t == typeof(sbyte) || t == typeof(short) || t == typeof(ushort) || t == typeof(int) ||
t == typeof(uint) || t == typeof(long) || t == typeof(ulong))
{
if (s.StartsWith("0x"))
if (s.StartsWith("0x", StringComparison.Ordinal))
{
if (t == typeof(ulong) || t == typeof(uint) || t == typeof(ushort) || t == typeof(byte))
{

2
Projects/UOContent/Gumps/Props/SetBodyGump.cs
View file

@ -310,7 +310,7 @@ namespace Server.Gumps
for (var i = 0; i < m_GroupNames.Length; ++i)
{
if (DisplayName.StartsWith(m_GroupNames[i]))
if (DisplayName.StartsWith(m_GroupNames[i], StringComparison.Ordinal))
{
DisplayName = DisplayName.Substring(m_GroupNames[i].Length);
break;