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/UOContent/Multis/Boats/BaseBoat.cs
View file

@ -1749,7 +1749,7 @@ namespace Server.Multis
{
item.NoMoveHS = true;
if (!(item is TillerMan || item is Hold || item is Plank))
if (!(item is Server.Items.TillerMan or Server.Items.Hold or Plank))
{
item.Location = new Point3D(item.X + xOffset, item.Y + yOffset, item.Z);
}

2
Projects/UOContent/Multis/Boats/Plank.cs
View file

@ -37,7 +37,7 @@ namespace Server.Items
public PlankSide Side { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public bool IsOpen => ItemID == 0x3ED5 || ItemID == 0x3ED4 || ItemID == 0x3E84 || ItemID == 0x3E89;
public bool IsOpen => ItemID is 0x3ED5 or 0x3ED4 or 0x3E84 or 0x3E89;
[CommandProperty(AccessLevel.GameMaster)]
public bool Starboard => Side == PlankSide.Starboard;

36
Projects/UOContent/Multis/Houses/BaseHouse.cs
View file

@ -116,7 +116,7 @@ namespace Server.Multis
return Core.AOS ? DecayType.Condemned : DecayType.ManualRefresh;
}
if (!(m_Owner.Account is Account acct))
if (m_Owner.Account is not Account acct)
{
return Core.AOS ? DecayType.Condemned : DecayType.ManualRefresh;
}
@ -185,7 +185,7 @@ namespace Server.Multis
{
var type = DecayType;
return type == DecayType.Condemned || type == DecayType.ManualRefresh;
return type is DecayType.Condemned or DecayType.ManualRefresh;
}
}
@ -258,7 +258,7 @@ namespace Server.Multis
{
foreach (var vendor in PlayerVendors)
{
if (!(vendor is RentedVendor))
if (vendor is not RentedVendor)
{
return true;
}
@ -463,7 +463,7 @@ namespace Server.Multis
continue;
}
if (!(info.Item is StrongBox))
if (info.Item is not StrongBox)
{
count += 1;
}
@ -756,7 +756,7 @@ namespace Server.Multis
{
if ((location.Z - entity.Z).Abs() <= 16)
{
if (entity is PlayerVendor || entity is PlayerBarkeeper || entity is PlayerVendorPlaceholder)
if (entity is PlayerVendor or PlayerBarkeeper or PlayerVendorPlaceholder)
{
vendor = true;
break;
@ -1495,7 +1495,7 @@ namespace Server.Multis
public SecureAccessResult CheckSecureAccess(Mobile m, Item item)
{
if (Secures == null || !(item is Container))
if (Secures == null || item is not Container)
{
return SecureAccessResult.Insecure;
}
@ -1770,7 +1770,7 @@ namespace Server.Multis
{
door = new GenericHouseDoor(DoorFacing.NorthCW, 0x2D46, 0xEA, 0xF1, false);
}
else if (itemID == 0x2D48 || itemID == 0x2FE2)
else if (itemID is 0x2D48 or 0x2FE2)
{
door = new GenericHouseDoor(DoorFacing.SouthCCW, itemID, 0xEA, 0xF1, false);
}
@ -1783,7 +1783,7 @@ namespace Server.Multis
door = new GenericHouseDoor(facing, 0x2D63 + 4 * type + mod * 2, 0xEA, 0xF1, false);
}
else if (itemID == 0x2FE4 || itemID == 0x31AE)
else if (itemID is 0x2FE4 or 0x31AE)
{
door = new GenericHouseDoor(DoorFacing.WestCCW, itemID, 0xEA, 0xF1, false);
}
@ -2057,7 +2057,7 @@ namespace Server.Multis
i.SetLastMoved();
}
if (i is Container && (!locked || !(i is BaseBoard || i is Aquarium || i is FishBowl)))
if (i is Container && (!locked || !(i is BaseBoard or Aquarium or FishBowl)))
{
foreach (var c in i.Items)
{
@ -2102,7 +2102,7 @@ namespace Server.Multis
{
m.SendLocalizedMessage(501736); // You must lockdown the container first!
}
else if (!(item is VendorRentalContract) && (IsAosRules
else if (item is not VendorRentalContract && (IsAosRules
? !CheckAosLockdowns(amt) || !CheckAosStorage(amt)
: LockDownCount + amt > MaxLockDowns))
{
@ -2119,7 +2119,7 @@ namespace Server.Multis
m.LocalOverheadMessage(MessageType.Regular, 0x3E9, 1005526); // That is already locked down
return true;
}
else if (item is HouseSign || item is Static)
else if (item is HouseSign or Static)
{
m.LocalOverheadMessage(MessageType.Regular, 0x3E9, 1005526); // This is already locked down.
}
@ -2363,7 +2363,7 @@ namespace Server.Multis
{
m.SendLocalizedMessage(1010550); // This is already locked down and cannot be secured.
}
else if (!(item is Container))
else if (item is not Container)
{
LockDown(m, item);
}
@ -2389,7 +2389,7 @@ namespace Server.Multis
m.SendLocalizedMessage(1010423); // You cannot secure this, place it on the ground first.
}
// Mondain's Legacy mod
else if (!(item is BaseAddonContainer) && !item.Movable)
else if (item is not BaseAddonContainer && !item.Movable)
{
m.SendLocalizedMessage(1010424); // You cannot secure this.
}
@ -2437,7 +2437,7 @@ namespace Server.Multis
if (info.Defender.Player && info.Defender.Alive &&
Core.Now - info.LastCombatTime < HouseRegion.CombatHeatDelay &&
(!(m.Guild is Guild attackerGuild) || !(info.Defender.Guild is Guild defenderGuild) ||
(m.Guild is not Guild attackerGuild || info.Defender.Guild is not Guild defenderGuild ||
defenderGuild != attackerGuild && !defenderGuild.IsEnemy(attackerGuild)))
{
return true;
@ -2946,7 +2946,7 @@ namespace Server.Multis
{
var item = LockDowns[i];
if (item is Container cont && !(cont is BaseBoard || cont is Aquarium || cont is FishBowl))
if (item is Container cont && !(cont is BaseBoard or Aquarium or FishBowl))
{
var children = cont.Items;
@ -3290,7 +3290,7 @@ namespace Server.Multis
{
var item = LockDowns[i];
if (!(item is Container))
if (item is not Container)
{
count += item.TotalItems;
}
@ -3486,7 +3486,7 @@ namespace Server.Multis
public static bool HasAccountHouse(Mobile m)
{
if (!(m.Account is Account a))
if (m.Account is not Account a)
{
return false;
}
@ -3596,7 +3596,7 @@ namespace Server.Multis
return true;
}
if (!(m is BaseCreature bc))
if (m is not BaseCreature bc)
{
return false;
}

12
Projects/UOContent/Multis/Houses/HouseFoundation.cs
View file

@ -430,7 +430,7 @@ namespace Server.Multis
{
door = new GenericHouseDoor(DoorFacing.NorthCW, 0x2D46, 0xEA, 0xF1, false);
}
else if (itemID == 0x2D48 || itemID == 0x2FE2)
else if (itemID is 0x2D48 or 0x2FE2)
{
door = new GenericHouseDoor(DoorFacing.SouthCCW, itemID, 0xEA, 0xF1, false);
}
@ -443,7 +443,7 @@ namespace Server.Multis
door = new GenericHouseDoor(facing, 0x2D63 + 4 * type + mod * 2, 0xEA, 0xF1, false);
}
else if (itemID == 0x2FE4 || itemID == 0x31AE)
else if (itemID is 0x2FE4 or 0x31AE)
{
door = new GenericHouseDoor(DoorFacing.WestCCW, itemID, 0xEA, 0xF1, false);
}
@ -453,11 +453,11 @@ namespace Server.Multis
var mod = (itemID - 0x319C) / 2 % 2;
var specialCase = itemID == 0x31AA || itemID == 0x31A8;
var specialCase = itemID is 0x31AA or 0x31A8;
DoorFacing facing;
if (itemID == 0x31AA || itemID == 0x31A8)
if (itemID is 0x31AA or 0x31A8)
{
facing = mod == 0 ? DoorFacing.NorthCW : DoorFacing.EastCW;
}
@ -1809,7 +1809,7 @@ namespace Server.Multis
var mcl = design.Components;
if (z < -3 || z > 12 || z % 3 != 0)
if (z is < -3 or > 12 || z % 3 != 0)
{
z = -3;
}
@ -2082,7 +2082,7 @@ namespace Server.Multis
}
// ML doors
if (itemID == 0x2D46 || itemID == 0x2D48 || itemID == 0x2FE2 || itemID == 0x2FE4)
if (itemID is 0x2D46 or 0x2D48 or 0x2FE2 or 0x2FE4)
{
return true;
}

2
Projects/UOContent/Multis/Houses/HousePlacement.cs
View file

@ -58,7 +58,7 @@ namespace Server.Multis
return HousePlacementResult.BadRegion; // No houses in Ilshenar/T2A
}
if (map == Map.Malas && (multiID == 0x007C || multiID == 0x007E))
if (map == Map.Malas && multiID is 0x007C or 0x007E)
{
return HousePlacementResult.InvalidCastleKeep;
}

2
Projects/UOContent/Multis/Houses/MovingCrate.cs
View file

@ -59,7 +59,7 @@ namespace Server.Multis
{
var subItem = subItems[i];
if (!(subItem is Container) && subItem.StackWith(null, dropped, false))
if (subItem is not Container && subItem.StackWith(null, dropped, false))
{
return;
}