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

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/Regions/GuardedRegion.cs
View file

@ -245,7 +245,7 @@ namespace Server.Regions
var noto = Notoriety.Compute(helper, helped);
if (helper != helped && (noto == Notoriety.Criminal || noto == Notoriety.Murderer))
if (helper != helped && noto is Notoriety.Criminal or Notoriety.Murderer)
{
CheckGuardCandidate(helper);
}
@ -358,8 +358,8 @@ namespace Server.Regions
}
public bool IsGuardCandidate(Mobile m) =>
!(m is BaseGuard) && m.Alive && m.AccessLevel <= AccessLevel.Player && !m.Blessed &&
(!(m is BaseCreature creature) || !creature.IsInvulnerable) && !IsDisabled() &&
m is not BaseGuard && m.Alive && m.AccessLevel <= AccessLevel.Player && !m.Blessed &&
(m is not BaseCreature creature || !creature.IsInvulnerable) && !IsDisabled() &&
(!AllowReds && m.Kills >= 5 || m.Criminal);
private class GuardTimer : Timer