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

Removes old comparable/comparers. (#31)

Browse source
This commit is contained in:
Kamron Batman 2019-03-11 15:35:04 -07:00 • committed by GitHub
parent 513e54f70e
commit a45094f2dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 95 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Server/Map.cs
View file

@ -275,7 +275,7 @@ namespace Server
[Parsable]
//[CustomEnum( new string[]{ "Felucca", "Trammel", "Ilshenar", "Malas", "Internal" } )]
public sealed class Map : IComparable, IComparable<Map>
public sealed class Map : IComparable<Map>
{
public const int SectorSize = 16;
public const int SectorShift = 4;
@ -391,20 +391,9 @@ namespace Server
public static int[] InvalidLandTiles{ get; set; } = { 0x244 };
public int CompareTo(object other)
{
if (other == null || other is Map)
return CompareTo(other);
throw new ArgumentException();
}
public int CompareTo(Map other)
{
if (other == null)
return -1;
return MapID.CompareTo(other.MapID);
return other == null ? -1 : MapID.CompareTo(other.MapID);
}
public static string[] GetMapNames()
@ -428,7 +417,7 @@ namespace Server
if (!int.TryParse(value, out int index))
return Maps.FirstOrDefault(m => m != null && Insensitive.Equals(m.Name, value));
return index == 127 ? Internal : Maps.FirstOrDefault(m => m != null && m.MapIndex == index);
return index == 127 ? Internal : Maps.FirstOrDefault(m => m?.MapIndex == index);
}
public override string ToString()
@ -967,16 +956,6 @@ namespace Server
return p;
}
private class ZComparer : IComparer<Item>
{
public static readonly ZComparer Default = new ZComparer();
public int Compare(Item x, Item y)
{
return x.Z.CompareTo(y.Z);
}
}
public class NullEnumerable<T> : IPooledEnumerable<T>
{
public static readonly NullEnumerable<T> Instance = new NullEnumerable<T>();