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

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

12
Scripts/Engines/ConPVP/Games/BombingRun.cs
View file

@ -778,10 +778,8 @@ namespace Server.Engines.ConPVP
return true;
}
else
{
return false;
}
return false;
}
}
@ -1158,9 +1156,6 @@ namespace Server.Engines.ConPVP
AddBorderedText( 235 + 15, 105 + ( i * 75 ), 250, 20, pl.Player.Name, 0xFFC000, BlackColor32 );
}
}
else
{
}
AddButton( 314, height - 42, 247, 248, 1, GumpButtonType.Reply, 0 );
}
@ -1402,8 +1397,7 @@ namespace Server.Engines.ConPVP
{
if ( m_Name != null )
return $"({Name}) ...";
else
return "...";
return "...";
}
}

7
Scripts/Engines/ConPVP/Games/CTF.cs
View file

@ -218,9 +218,6 @@ namespace Server.Engines.ConPVP
AddBorderedText( 235 + 15, 105 + ( i * 75 ), 250, 20, pl.Player.Name, 0xFFC000, BlackColor32 );
}
}
else
{
}
AddButton( 314, height - 42, 247, 248, 1, GumpButtonType.Reply, 0 );
}
@ -449,7 +446,7 @@ namespace Server.Engines.ConPVP
else if ( passTeam == useTeam && passTo.PlaceInBackpack( this ) )
{
passTo.LocalOverheadMessage( MessageType.Regular, 0x59, false,
$"{@from.Name} has passed you the cookies!");
$"{from.Name} has passed you the cookies!");
}
else
{
@ -496,7 +493,7 @@ namespace Server.Engines.ConPVP
Mobile mob = FindOwner( parent );
if ( mob != null )
mob.SolidHueOverride = ( m_TeamInfo == null ? -1 : m_TeamInfo.Game.GetColor( mob ) );
mob.SolidHueOverride = m_TeamInfo?.Game.GetColor( mob ) ?? -1;
}
public CTFFlag( Serial serial )

3
Scripts/Engines/ConPVP/Games/DoubleDom.cs
View file

@ -214,9 +214,6 @@ namespace Server.Engines.ConPVP
AddBorderedText( 235 + 15, 105 + ( i * 75 ), 250, 20, pl.Player.Name, 0xFFC000, BlackColor32 );
}
}
else
{
}
AddButton( 314, height - 42, 247, 248, 1, GumpButtonType.Reply, 0 );
}

18
Scripts/Engines/ConPVP/Games/KingOfTheHill.cs
View file

@ -83,10 +83,9 @@ namespace Server.Engines.ConPVP
{
get
{
if (m_KingTimer != null)
if (m_KingTimer != null)
return m_KingTimer.Captures;
else
return 0;
return 0;
}
}
@ -136,17 +135,15 @@ namespace Server.Engines.ConPVP
public override bool OnMoveOff(Mobile m)
{
if (base.OnMoveOff(m))
if (base.OnMoveOff(m))
{
if (m_King == m)
DeKingify();
return true;
}
else
{
return false;
}
return false;
}
public virtual void OnKingDied(Mobile king, KHTeamInfo kingTeam, Mobile killer, KHTeamInfo killerTeam)
@ -725,10 +722,9 @@ namespace Server.Engines.ConPVP
public override string ToString()
{
if (m_Name != null)
if (m_Name != null)
return $"({Name}) ...";
else
return "...";
return "...";
}
}