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

6
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs
View file

@ -178,7 +178,7 @@ namespace Server.Items
}
}
}
else if ((item is Runebook || item is RecallRune) && m_Tub.AllowRunebooks)
else if (item is Runebook or RecallRune && m_Tub.AllowRunebooks)
{
if (!from.InRange(m_Tub.GetWorldLocation(), 1) || !from.InRange(item.GetWorldLocation(), 1))
{
@ -211,9 +211,7 @@ namespace Server.Items
}
}
else if ((item is BaseArmor armor &&
(armor.MaterialType == ArmorMaterialType.Leather ||
armor.MaterialType == ArmorMaterialType.Studded) || item is ElvenBoots ||
item is WoodlandBelt) && m_Tub.AllowLeather)
armor.MaterialType is ArmorMaterialType.Leather or ArmorMaterialType.Studded || item is ElvenBoots or WoodlandBelt) && m_Tub.AllowLeather)
{
if (!from.InRange(m_Tub.GetWorldLocation(), 1) || !from.InRange(item.GetWorldLocation(), 1))
{

4
Projects/UOContent/Items/Skill Items/Tailor Items/Misc/Scissors.cs
View file

@ -84,7 +84,7 @@ namespace Server.Items
}
else if (targeted is Item item && !item.Movable)
{
if (item is IScissorable obj && (obj is PlagueBeastInnard || obj is PlagueBeastMutationCore))
if (item is IScissorable obj && obj is PlagueBeastInnard or PlagueBeastMutationCore)
{
if (CanScissor(from, obj) && obj.Scissor(from, m_Item))
{
@ -107,7 +107,7 @@ namespace Server.Items
protected override void OnNonlocalTarget(Mobile from, object targeted)
{
if (targeted is IScissorable obj && (obj is PlagueBeastInnard || obj is PlagueBeastMutationCore))
if (targeted is IScissorable obj && obj is PlagueBeastInnard or PlagueBeastMutationCore)
{
if (CanScissor(from, obj) && obj.Scissor(from, m_Item))
{