chore: Cleans up pattern checks. (#892)
This commit is contained in:
parent
171df32257
commit
63e1b02d93
283 changed files with 587 additions and 702 deletions
|
|
@ -40,7 +40,7 @@ namespace Server.Guilds
|
|||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
if (!(sender.Mobile is PlayerMobile pm))
|
||||
if (sender.Mobile is not PlayerMobile pm)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -71,11 +71,11 @@ namespace Server.Guilds
|
|||
}
|
||||
|
||||
public static bool IsLeader(Mobile m, Guild g) =>
|
||||
!(m.Deleted || g.Disbanded || !(m is PlayerMobile) ||
|
||||
!(m.Deleted || g.Disbanded || m is not PlayerMobile ||
|
||||
m.AccessLevel < AccessLevel.GameMaster && g.Leader != m);
|
||||
|
||||
public static bool IsMember(Mobile m, Guild g) =>
|
||||
!(m.Deleted || g.Disbanded || !(m is PlayerMobile) ||
|
||||
!(m.Deleted || g.Disbanded || m is not PlayerMobile ||
|
||||
m.AccessLevel < AccessLevel.GameMaster && !g.IsMember(m));
|
||||
|
||||
public static bool CheckProfanity(string s, int maxLength = 50)
|
||||
|
|
@ -96,7 +96,7 @@ namespace Server.Guilds
|
|||
{
|
||||
var c = s[i];
|
||||
|
||||
if ((c < 'a' || c > 'z') && (c < '0' || c > '9'))
|
||||
if (c is < 'a' or > 'z' && c is < '0' or > '9')
|
||||
{
|
||||
var except = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ namespace Server.Guilds
|
|||
{
|
||||
base.OnResponse(sender, info);
|
||||
|
||||
if (!(sender.Mobile is PlayerMobile pm) || !IsMember(pm, guild))
|
||||
if (sender.Mobile is not PlayerMobile pm || !IsMember(pm, guild))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ namespace Server.Guilds
|
|||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
if (!(sender.Mobile is PlayerMobile pm) || pm.Guild != null)
|
||||
if (sender.Mobile is not PlayerMobile pm || pm.Guild != null)
|
||||
{
|
||||
return; // Sanity
|
||||
}
|
||||
|
|
|
|||
|
|
@ -208,15 +208,8 @@ namespace Server.Guilds
|
|||
{
|
||||
case GuildDisplayType.Relations:
|
||||
{
|
||||
// if (!( guild.IsWar( g ) || guild.IsAlly( g ) ))
|
||||
|
||||
if (!(guild.FindActiveWar(g) != null || guild.IsAlly(g))
|
||||
) // As per OSI, only the guild leader wars show up under the sorting by relation
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
// As per OSI, only the guild leader wars show up under the sorting by relation
|
||||
return !(guild.FindActiveWar(g) != null || guild.IsAlly(g));
|
||||
}
|
||||
case GuildDisplayType.AwaitingAction:
|
||||
{
|
||||
|
|
@ -247,7 +240,7 @@ namespace Server.Guilds
|
|||
{
|
||||
base.OnResponse(sender, info);
|
||||
|
||||
if (!(sender.Mobile is PlayerMobile pm) || !IsMember(pm, guild))
|
||||
if (sender.Mobile is not PlayerMobile pm || !IsMember(pm, guild))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ namespace Server.Guilds
|
|||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
if (!(sender.Mobile is PlayerMobile pm) || !IsMember(pm, guild) || !IsMember(m_Member, guild))
|
||||
if (sender.Mobile is not PlayerMobile pm || !IsMember(pm, guild) || !IsMember(m_Member, guild))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -244,12 +244,12 @@ namespace Server.Guilds
|
|||
|
||||
public void SetTitle_Callback(Mobile from, string text)
|
||||
{
|
||||
if (!(from is PlayerMobile pm) || m_Member == null)
|
||||
if (@from is not PlayerMobile pm || m_Member == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!(m_Member.Guild is Guild g) || !IsMember(pm, g) ||
|
||||
if (m_Member.Guild is not Guild g || !IsMember(pm, g) ||
|
||||
!(pm.GuildRank.GetFlag(RankFlags.CanSetGuildTitle) &&
|
||||
(pm.GuildRank.Rank > m_Member.GuildRank.Rank || pm == m_Member)))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ namespace Server.Guilds
|
|||
{
|
||||
base.OnResponse(sender, info);
|
||||
|
||||
if (!(sender.Mobile is PlayerMobile pm) || !IsMember(pm, guild))
|
||||
if (sender.Mobile is not PlayerMobile pm || !IsMember(pm, guild))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -715,7 +715,7 @@ namespace Server.Guilds
|
|||
|
||||
public void CreateAlliance_Callback(Mobile from, string text)
|
||||
{
|
||||
if (!(from is PlayerMobile pm))
|
||||
if (@from is not PlayerMobile pm)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue