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

Adds style cop (#109)

Browse source
This commit is contained in:
Kamron Batman 2020-04-26 00:16:02 -07:00 • committed by GitHub
parent 3e715bcb60
commit 556a17aba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1725 changed files with 33831 additions and 38046 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Projects/Server/Body.cs
View file

@ -33,15 +33,15 @@ namespace Server
Equipment
}
public struct Body
public readonly struct Body : IEquatable<object>, IEquatable<Body>, IEquatable<int>
{
private static readonly BodyType[] m_Types;
private static readonly BodyType[] m_Types = Array.Empty<BodyType>();
static Body()
{
if (File.Exists("Data/bodyTable.cfg"))
{
using StreamReader ip = new StreamReader("Data/bodyTable.cfg");
using var ip = new StreamReader("Data/bodyTable.cfg");
m_Types = new BodyType[0x1000];
string line;
@ -51,9 +51,9 @@ namespace Server
if (line.Length == 0 || line.StartsWith("#"))
continue;
string[] split = line.Split('\t');
var split = line.Split('\t');
if (int.TryParse(split[0], out int bodyID) && Enum.TryParse(split[1], true, out BodyType type) && bodyID >= 0 &&
if (int.TryParse(split[0], out var bodyID) && Enum.TryParse(split[1], true, out BodyType type) && bodyID >= 0 &&
bodyID < m_Types.Length)
{
m_Types[bodyID] = type;
@ -68,8 +68,6 @@ namespace Server
else
{
Console.WriteLine("Warning: Data/bodyTable.cfg does not exist");
m_Types = new BodyType[0];
}
}
@ -141,7 +139,7 @@ namespace Server
&& BodyID < m_Types.Length
&& m_Types[BodyID] == BodyType.Equipment;
public int BodyID{ get; }
public int BodyID { get; }
public static implicit operator int(Body a) => a.BodyID;
@ -153,6 +151,10 @@ namespace Server
public override bool Equals(object o) => o is Body b && b.BodyID == BodyID;
public bool Equals(Body b) => b.BodyID == BodyID;
public bool Equals(int number) => number == BodyID;
public static bool operator ==(Body l, Body r) => l.BodyID == r.BodyID;
public static bool operator !=(Body l, Body r) => l.BodyID != r.BodyID;