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

Fixes more casting and other formatting issues.

Browse source
This commit is contained in:
Kamron Batman 2018-08-19 10:14:40 +08:00
parent 03dd5f1926
commit 61937d9c97
67 changed files with 325 additions and 570 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Scripts/Engines/MyRunUO/DatabaseCommandQueue.cs
View file

@ -162,9 +162,9 @@ namespace Server.Engines.MyRunUO
}
}
}
else if ( obj is string )
else if ( obj is string s )
{
command.CommandText = (string)obj;
command.CommandText = s;
command.ExecuteNonQuery();
}
else
@ -199,4 +199,4 @@ namespace Server.Engines.MyRunUO
}
}
}
}
}

27
Scripts/Engines/MyRunUO/MyRunUO.cs
View file

@ -36,9 +36,7 @@ namespace Server.Engines.MyRunUO
[Description( "Enables showing extended character stats and skills in MyRunUO." )]
public static void PublicChar_OnCommand( CommandEventArgs e )
{
PlayerMobile pm = e.Mobile as PlayerMobile;
if ( pm != null )
if ( e.Mobile is PlayerMobile pm )
{
if ( pm.PublicMyRunUO )
{
@ -56,9 +54,7 @@ namespace Server.Engines.MyRunUO
[Description( "Disables showing extended character stats and skills in MyRunUO." )]
public static void PrivateChar_OnCommand( CommandEventArgs e )
{
PlayerMobile pm = e.Mobile as PlayerMobile;
if ( pm != null )
if ( e.Mobile is PlayerMobile pm )
{
if ( !pm.PublicMyRunUO )
{
@ -91,7 +87,7 @@ namespace Server.Engines.MyRunUO
{
if ( m_Command != null && !m_Command.HasCompleted )
return;
DateTime start = DateTime.Now;
// DateTime start = DateTime.Now;
Console.WriteLine( "MyRunUO: Creating tables" );
try
{
@ -108,8 +104,8 @@ namespace Server.Engines.MyRunUO
Console.WriteLine( "MyRunUO: Error creating tables." );
Console.WriteLine( e );
}
if ( m_Command != null )
m_Command.Enqueue( null );
m_Command?.Enqueue( null );
}
[Usage( "UpdateMyRunUO" )]
@ -334,7 +330,7 @@ namespace Server.Engines.MyRunUO
sb.Append( ent );
}
private string SafeString( string input )
{
if ( input == null )
@ -364,8 +360,7 @@ namespace Server.Engines.MyRunUO
case '\\': AppendCharEntity( input, i, ref sb, c ); break;
default:
{
if ( sb != null )
sb.Append( c );
sb?.Append( c );
break;
}
@ -394,8 +389,8 @@ namespace Server.Engines.MyRunUO
string notoTitle = SafeString( Titles.ComputeTitle( null, mob ) );
string female = ( mob.Female ? "1" : "0" );
bool pubBool = ( mob is PlayerMobile ) && ( ((PlayerMobile)mob).PublicMyRunUO );
bool pubBool = mob is PlayerMobile mobile && mobile.PublicMyRunUO;
string pubString = ( pubBool ? "1" : "0" );
@ -571,8 +566,8 @@ namespace Server.Engines.MyRunUO
{
Mobile mob = (Mobile)m_List[i];
if ( mob is PlayerMobile )
((PlayerMobile)mob).ChangedMyRunUO = false;
if ( mob is PlayerMobile mobile )
mobile.ChangedMyRunUO = false;
if ( !mob.Deleted && mob.AccessLevel < Config.HiddenAccessLevel )
{