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

Fixes implicit ternary expressions

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 14:56:48 -07:00
parent c85b0a740c
commit ff26dfa375
345 changed files with 1905 additions and 2336 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Scripts/Gumps/Guilds/GuildAdminCandidatesGump.cs
View file

@ -53,8 +53,8 @@ namespace Server.Gumps
PlayerState guildState = PlayerState.Find( m_Guild.Leader );
PlayerState targetState = PlayerState.Find( m );
Faction guildFaction = ( guildState == null ? null : guildState.Faction );
Faction targetFaction = ( targetState == null ? null : targetState.Faction );
Faction guildFaction = guildState?.Faction;
Faction targetFaction = targetState?.Faction;
if ( guildFaction != targetFaction )
{
@ -67,7 +67,8 @@ namespace Server.Gumps
break;
}
else if ( targetState != null && targetState.IsLeaving )
if ( targetState != null && targetState.IsLeaving )
{
// OSI does this quite strangely, so we'll just do it this way
m_Mobile.SendMessage( "That person is quitting their faction and so you may not recruit them." );

4
Scripts/Gumps/Guilds/GuildTitlePrompt.cs
View file

@ -19,7 +19,7 @@ namespace Server.Gumps
{
if ( GuildGump.BadLeader( m_Leader, m_Guild ) )
return;
else if ( m_Target.Deleted || !m_Guild.IsMember( m_Target ) )
if ( m_Target.Deleted || !m_Guild.IsMember( m_Target ) )
return;
GuildGump.EnsureClosed( m_Leader );
@ -30,7 +30,7 @@ namespace Server.Gumps
{
if ( GuildGump.BadLeader( m_Leader, m_Guild ) )
return;
else if ( m_Target.Deleted || !m_Guild.IsMember( m_Target ) )
if ( m_Target.Deleted || !m_Guild.IsMember( m_Target ) )
return;
text = text.Trim();

12
Scripts/Gumps/Guilds/New Guild System/DiplomacyGump.cs
View file

@ -29,9 +29,9 @@ namespace Server.Guilds
{
if ( x == null && y == null )
return 0;
else if ( x == null )
if ( x == null )
return -1;
else if ( y == null )
if ( y == null )
return 1;
return Insensitive.Compare( x.Name, y.Name );
@ -56,9 +56,9 @@ namespace Server.Guilds
{
if ( x == null && y == null )
return 0;
else if ( x == null )
if ( x == null )
return -1;
else if ( y == null )
if ( y == null )
return 1;
GuildCompareStatus aStatus = GuildCompareStatus.Peace;
@ -90,9 +90,9 @@ namespace Server.Guilds
{
if ( x == null && y == null )
return 0;
else if ( x == null )
if ( x == null )
return -1;
else if ( y == null )
if ( y == null )
return 1;
return Insensitive.Compare( x.Abbreviation, y.Abbreviation );

29
Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs
View file

@ -22,9 +22,9 @@ namespace Server.Guilds
{
if ( x == null && y == null )
return 0;
else if ( x == null )
if ( x == null )
return -1;
else if ( y == null )
if ( y == null )
return 1;
return Insensitive.Compare( x.Name, y.Name );
@ -43,9 +43,9 @@ namespace Server.Guilds
{
if ( x == null && y == null )
return 0;
else if ( x == null )
if ( x == null )
return -1;
else if ( y == null )
if ( y == null )
return 1;
NetState aState = x.NetState;
@ -53,12 +53,11 @@ namespace Server.Guilds
if ( aState == null && bState == null )
return x.LastOnline.CompareTo( y.LastOnline );
else if ( aState == null )
if ( aState == null )
return -1;
else if ( bState == null )
if ( bState == null )
return 1;
else
return 0;
return 0;
}
}
private class TitleComparer : IComparer<PlayerMobile>
@ -73,9 +72,9 @@ namespace Server.Guilds
{
if ( x == null && y == null )
return 0;
else if ( x == null )
if ( x == null )
return -1;
else if ( y == null )
if ( y == null )
return 1;
return Insensitive.Compare( x.GuildTitle, y.GuildTitle );
@ -94,9 +93,9 @@ namespace Server.Guilds
{
if ( x == null && y == null )
return 0;
else if ( x == null )
if ( x == null )
return -1;
else if ( y == null )
if ( y == null )
return 1;
return x.GuildRank.Rank.CompareTo( y.GuildRank.Rank );
@ -151,7 +150,7 @@ namespace Server.Guilds
defs[0] = name;
defs[1] = pm.GuildRank.Name;
defs[2] = (pm.NetState != null) ? new TextDefinition( 1063015 ): new TextDefinition( pm.LastOnline.ToString( "yyyy-MM-dd" ) );
defs[3] = (pm.GuildTitle == null) ? "" : pm.GuildTitle;
defs[3] = pm.GuildTitle ?? "";
return defs;
}
@ -203,8 +202,8 @@ namespace Server.Guilds
PlayerState guildState = PlayerState.Find( g.Leader );
PlayerState targetState = PlayerState.Find( targ );
Faction guildFaction = ( guildState == null ? null : guildState.Faction );
Faction targetFaction = ( targetState == null ? null : targetState.Faction );
Faction guildFaction = guildState?.Faction;
Faction targetFaction = targetState?.Faction;
if ( pm == null || !IsMember( pm, guild ) || !pm.GuildRank.GetFlag( RankFlags.CanInvitePlayer ) )
{