chore: Cleans up pattern checks. (#892)
This commit is contained in:
parent
171df32257
commit
63e1b02d93
283 changed files with 587 additions and 702 deletions
|
|
@ -68,13 +68,13 @@ namespace Server.Items
|
|||
new Bola().MoveToWorld(to.Location, to.Map);
|
||||
}
|
||||
|
||||
if (to is ChaosDragoon || to is ChaosDragoonElite)
|
||||
if (to is ChaosDragoon or ChaosDragoonElite)
|
||||
{
|
||||
from.SendLocalizedMessage(1042047); // You fail to knock the rider from its mount.
|
||||
}
|
||||
|
||||
var mt = to.Mount;
|
||||
if (mt != null && !(to is ChaosDragoon || to is ChaosDragoonElite))
|
||||
if (mt != null && !(to is ChaosDragoon or ChaosDragoonElite))
|
||||
{
|
||||
mt.Rider = null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ namespace Server.Items
|
|||
|
||||
public override void OnSpeech(SpeechEventArgs e)
|
||||
{
|
||||
if (!Active || Receivers.Count == 0 || RootParent != null && !(RootParent is Mobile))
|
||||
if (!Active || Receivers.Count == 0 || RootParent != null && RootParent is not Mobile)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -789,7 +789,7 @@ namespace Server.Items
|
|||
|
||||
public bool DevourCorpse()
|
||||
{
|
||||
if (Devoured || Deleted || Killer?.Deleted != false || !Killer.Alive || !(Killer is IDevourer devourer) ||
|
||||
if (Devoured || Deleted || Killer?.Deleted != false || !Killer.Alive || Killer is not IDevourer devourer ||
|
||||
Owner?.Deleted != false)
|
||||
{
|
||||
return false;
|
||||
|
|
@ -1003,8 +1003,7 @@ namespace Server.Items
|
|||
var item = items[i];
|
||||
var loc = item.Location;
|
||||
|
||||
if (item.Layer == Layer.Hair || item.Layer == Layer.FacialHair || !item.Movable ||
|
||||
!GetRestoreInfo(item, ref loc))
|
||||
if (item.Layer is Layer.Hair or Layer.FacialHair || !item.Movable || !GetRestoreInfo(item, ref loc))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
|
@ -1055,7 +1054,7 @@ namespace Server.Items
|
|||
return;
|
||||
}
|
||||
|
||||
if (!(from is PlayerMobile player))
|
||||
if (@from is not PlayerMobile player)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ namespace Server.Items
|
|||
{
|
||||
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that
|
||||
}
|
||||
else if (Visible && (ItemID == 4656 || ItemID == 4702) && Core.Now >= m_NextUse)
|
||||
else if (Visible && ItemID is 4656 or 4702 && Core.Now >= m_NextUse)
|
||||
{
|
||||
var p = GetWorldLocation();
|
||||
|
||||
|
|
@ -89,11 +89,11 @@ namespace Server.Items
|
|||
|
||||
private void BackUp()
|
||||
{
|
||||
if (ItemID == 4678 || ItemID == 4679)
|
||||
if (ItemID is 4678 or 4679)
|
||||
{
|
||||
ItemID = 4656;
|
||||
}
|
||||
else if (ItemID == 4712 || ItemID == 4713)
|
||||
else if (ItemID is 4712 or 4713)
|
||||
{
|
||||
ItemID = 4702;
|
||||
}
|
||||
|
|
@ -112,11 +112,11 @@ namespace Server.Items
|
|||
|
||||
int version = reader.ReadByte();
|
||||
|
||||
if (ItemID == 4678 || ItemID == 4679)
|
||||
if (ItemID is 4678 or 4679)
|
||||
{
|
||||
ItemID = 4656;
|
||||
}
|
||||
else if (ItemID == 4712 || ItemID == 4713)
|
||||
else if (ItemID is 4712 or 4713)
|
||||
{
|
||||
ItemID = 4702;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ namespace Server.Items
|
|||
return false;
|
||||
}
|
||||
|
||||
if (!(dropped is Key key) || key.KeyValue == 0)
|
||||
if (dropped is not Key key || key.KeyValue == 0)
|
||||
{
|
||||
from.SendLocalizedMessage(501689); // Only non-blank keys can be put on a keyring.
|
||||
return false;
|
||||
|
|
@ -80,7 +80,7 @@ namespace Server.Items
|
|||
|
||||
public void Open(Mobile from)
|
||||
{
|
||||
if (!(Parent is Container cont))
|
||||
if (Parent is not Container cont)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ namespace Server.Items
|
|||
|
||||
foreach (var m in GetMobilesInRange(0))
|
||||
{
|
||||
if (m.Alive && !m.IsDeadBondedPet && (!(m is BaseCreature bc) || bc.Controlled || bc.Summoned))
|
||||
if (m.Alive && !m.IsDeadBondedPet && (m is not BaseCreature bc || bc.Controlled || bc.Summoned))
|
||||
{
|
||||
toDamage.Add(m);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue