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

Sets a default parameter for OnHit. More casting cleanup.

Browse source
This commit is contained in:
Kamron Batman 2018-09-09 08:54:10 -07:00
parent 74f498c1c8
commit d6c0bf2d4c
96 changed files with 350 additions and 579 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Scripts/Items/Special/House Raffle/HouseRaffleManagementGump.cs
View file

@ -205,9 +205,7 @@ namespace Server.Gumps
if ( entry.From != null )
{
Account acc = entry.From.Account as Account;
if ( acc != null )
if ( entry.From.Account is Account acc )
name = String.Format( "{0} ({1})", entry.From.Name, acc );
else
name = entry.From.Name;

12
Scripts/Items/Special/House Raffle/HouseRaffleStone.cs
View file

@ -322,9 +322,7 @@ namespace Server.Items
private bool HasEntered( Mobile from )
{
Account acc = from.Account as Account;
if ( acc == null )
if ( !(from.Account is Account acc) )
return false;
foreach ( RaffleEntry entry in m_Entries )
@ -370,7 +368,7 @@ namespace Server.Items
bool xEast = false, ySouth = false;
if ( Sextant.Format( loc, map, ref xLong, ref yLat, ref xMins, ref yMins, ref xEast, ref ySouth ) )
result.AppendFormat( "{0}°{1}'{2},{3}°{4}'{5}", yLat, yMins, ySouth ? "S" : "N", xLong, xMins, xEast ? "E" : "W" );
result.AppendFormat( "{0}°{1}'{2},{3}°{4}'{5}", yLat, yMins, ySouth ? "S" : "N", xLong, xMins, xEast ? "E" : "W" );
else
result.AppendFormat( "{0},{1}", loc.X, loc.Y );
@ -492,9 +490,7 @@ namespace Server.Items
if ( Deleted || m_State != HouseRaffleState.Active || !from.CheckAlive() || HasEntered( from ) || IsAtIPLimit( from ) )
return;
Account acc = from.Account as Account;
if ( acc == null )
if ( !(from.Account is Account) )
return;
if ( okay )
@ -619,7 +615,7 @@ namespace Server.Items
}
case 0:
{
bool oldActive = ( version < 3 ) ? reader.ReadBool() : false;
bool oldActive = ( version < 3 ) && reader.ReadBool();
m_Bounds = reader.ReadRect2D();
m_Facet = reader.ReadMap();