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

chore: Cleans up pattern checks. (#892)

Browse source
This commit is contained in:
Kamron Batman 2021-12-24 15:53:59 -08:00 • committed by GitHub
parent 171df32257
commit 63e1b02d93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
283 changed files with 587 additions and 702 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Server/Attributes.cs
View file

@ -71,7 +71,7 @@ namespace Server
return 50;
}
if (!(objs[0] is CallPriorityAttribute attr))
if (objs[0] is not CallPriorityAttribute attr)
{
return 50;
}

2
Projects/Server/Collections/PooledRefQueue.cs
View file

@ -451,7 +451,7 @@ namespace Server.Collections
private void ThrowEnumerationNotStartedOrEnded()
{
Debug.Assert(_index == -1 || _index == -2);
Debug.Assert(_index is -1 or -2);
throw new InvalidOperationException(_index == -1 ? CollectionThrowStrings.InvalidOperation_EnumNotStarted : CollectionThrowStrings.InvalidOperation_EnumEnded);
}

2
Projects/Server/ContextMenus/ContextMenu.cs
View file

@ -70,7 +70,7 @@ namespace Server.ContextMenus
for (var i = 0; i < Entries.Length; ++i)
{
var number = Entries[i].Number;
if (number < 3000000 || number > 3032767)
if (number is < 3000000 or > 3032767)
{
return true;
}

6
Projects/Server/Items/Container.cs
View file

@ -231,7 +231,7 @@ namespace Server.Items
return container.CheckHold(m, item, message, checkItems, plusItems, plusWeight);
}
if (!(parent is Item parentItem))
if (parent is not Item parentItem)
{
break;
}
@ -504,7 +504,7 @@ namespace Server.Items
{
var item = list[i];
if (!(item is Container) && CheckHold(from, dropped, false, false) &&
if (item is not Container && CheckHold(from, dropped, false, false) &&
item.StackWith(from, dropped, playSound))
{
return true;
@ -540,7 +540,7 @@ namespace Server.Items
{
var item = list[j];
if (!(item is Container) && CheckHold(from, dropped, false, false, 0, extraWeight) &&
if (item is not Container && CheckHold(from, dropped, false, false, 0, extraWeight) &&
item.CanStackWith(dropped))
{
stackItems.Add(new ItemStackEntry(item, dropped));

2
Projects/Server/Items/Item.cs
View file

@ -443,7 +443,7 @@ namespace Server
var weight = TileData.ItemTable[m_ItemID].Weight;
if (weight == 255 || weight == 0)
if (weight is 255 or 0)
{
weight = 1;
}

4
Projects/Server/Json/Converters/Rectangle3DConverter.cs
View file

@ -78,7 +78,7 @@ namespace Server.Json
reader.Read();
if (key == "start" || key == "end")
if (key is "start" or "end")
{
if (objType > -1 && objType != 2)
{
@ -140,7 +140,7 @@ namespace Server.Json
objType = 1;
data[i - 10] = reader.GetInt32();
if (i == 12 || i == 15)
if (i is 12 or 15)
{
hasZ = true;
}

6
Projects/Server/Maps/Map.cs
View file

@ -520,7 +520,7 @@ namespace Server
var eable = map.GetItemsInRange(new Point3D(x, y, 0), 0);
pool.AddRange(
eable.Where(item => item.ItemID <= TileData.MaxItemValue && !(item is BaseMulti))
eable.Where(item => item.ItemID <= TileData.MaxItemValue && item is not BaseMulti)
.OrderBy(item => item.Z)
.Take(pool.Capacity)
);
@ -715,7 +715,7 @@ namespace Server
{
var item = sector.Items[i];
if (!(item is BaseMulti) && item.ItemID <= TileData.MaxItemValue && item.AtWorldPoint(p.X, p.Y) &&
if (item is not BaseMulti && item.ItemID <= TileData.MaxItemValue && item.AtWorldPoint(p.X, p.Y) &&
!item.Movable)
{
var id = item.ItemData;
@ -1145,7 +1145,7 @@ namespace Server
{
var item = items[i];
if (!(item is BaseMulti) && item.ItemID <= TileData.MaxItemValue && item.AtWorldPoint(x, y))
if (item is not BaseMulti && item.ItemID <= TileData.MaxItemValue && item.AtWorldPoint(x, y))
{
var id = item.ItemData;
surface = id.Surface;

4
Projects/Server/Mobiles/Mobile.cs
View file

@ -1888,7 +1888,7 @@ namespace Server
item ??= FindItemOnLayer(Layer.Mount);
if (!(item is IMountItem mountItem))
if (item is not IMountItem mountItem)
{
return null;
}
@ -8397,7 +8397,7 @@ namespace Server
var n = Notoriety.Compute(this, target);
return n == Notoriety.Criminal || n == Notoriety.Murderer;
return n is Notoriety.Criminal or Notoriety.Murderer;
}
/// <summary>

8
Projects/Server/Network/NetState/NetState.cs
View file

@ -223,7 +223,7 @@ namespace Server.Network
private void SetPacketTime(int packetID)
{
if (packetID < 0 || packetID >= 0x100)
if (packetID is < 0 or >= 0x100)
{
return;
}
@ -233,7 +233,7 @@ namespace Server.Network
public long GetPacketDelay(int packetID)
{
if (packetID < 0 || packetID >= 0x100)
if (packetID is < 0 or >= 0x100)
{
return 0;
}
@ -243,7 +243,7 @@ namespace Server.Network
private void UpdatePacketCount(int packetID)
{
if (packetID < 0 || packetID >= 0x100)
if (packetID is < 0 or >= 0x100)
{
return;
}
@ -728,7 +728,7 @@ namespace Server.Network
{
reader.Advance((uint)packetLength);
}
else if (_parserState == ParserState.AwaitingPartialPacket || _parserState == ParserState.Throttled)
else if (_parserState is ParserState.AwaitingPartialPacket or ParserState.Throttled)
{
break;
}

6
Projects/Server/Network/Packets/IncomingMessagePackets.cs
View file

@ -60,7 +60,7 @@ namespace Server.Network
reader.ReadInt16(); // font
var text = reader.ReadAsciiSafe().Trim();
if (text.Length <= 0 || text.Length > 128)
if (text.Length is <= 0 or > 128)
{
return;
}
@ -97,7 +97,7 @@ namespace Server.Network
var count = (value & 0xFFF0) >> 4;
var hold = value & 0xF;
if (count < 0 || count > 50)
if (count is < 0 or > 50)
{
return;
}
@ -141,7 +141,7 @@ namespace Server.Network
text = text.Trim();
if (text.Length <= 0 || text.Length > 128)
if (text.Length is <= 0 or > 128)
{
return;
}

4
Projects/Server/Skills.cs
View file

@ -135,7 +135,7 @@ namespace Server
}
}
if (Lock < SkillLock.Up || Lock > SkillLock.Locked)
if (Lock is < SkillLock.Up or > SkillLock.Locked)
{
Console.WriteLine("Bad skill lock -> {0}.{1}", owner.Owner, Lock);
Lock = SkillLock.Up;
@ -323,7 +323,7 @@ namespace Server
public void SetLockNoRelay(SkillLock skillLock)
{
if (skillLock < SkillLock.Up || skillLock > SkillLock.Locked)
if (skillLock is < SkillLock.Up or > SkillLock.Locked)
{
return;
}

2
Projects/Server/Utilities/Utility.cs
View file

@ -343,7 +343,7 @@ namespace Server
if (endOfSection || i + 1 == end)
{
if (number < 0 || number > 255)
if (number is < 0 or > 255)
{
valid = false;
return false;