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

26
Scripts/Engines/Spawner/Spawner.cs
View file

@ -113,8 +113,7 @@ namespace Server.Mobiles
{
if ( m_Running && m_Timer != null && m_Timer.Running )
return m_End - DateTime.UtcNow;
else
return TimeSpan.FromSeconds( 0 );
return TimeSpan.FromSeconds( 0 );
}
set
{
@ -388,15 +387,11 @@ namespace Server.Mobiles
if ( thisProp == null )
return null;
else
{
CPA attr = Properties.GetCPA( thisProp );
CPA attr = Properties.GetCPA( thisProp );
if ( attr == null || AccessLevel.Developer < attr.WriteLevel || !thisProp.CanWrite || attr.ReadOnly )
return null;
else
realProps[i] = thisProp;
}
if ( attr == null || AccessLevel.Developer < attr.WriteLevel || !thisProp.CanWrite || attr.ReadOnly )
return null;
realProps[i] = thisProp;
}
}
@ -407,11 +402,8 @@ namespace Server.Mobiles
{
if ( index >= 0 && index < m_Entries.Count )
return Spawn( m_Entries[index], out flags );
else
{
flags = EntryFlags.InvalidEntry;
return false;
}
flags = EntryFlags.InvalidEntry;
return false;
}
public bool Spawn( SpawnerEntry entry, out EntryFlags flags )
@ -606,7 +598,7 @@ namespace Server.Mobiles
{
if ( IsValidWater( map, x, y, Z ) )
return new Point3D( x, y, Z );
else if ( IsValidWater( map, x, y, mapZ ) )
if ( IsValidWater( map, x, y, mapZ ) )
return new Point3D( x, y, mapZ );
}
@ -614,7 +606,7 @@ namespace Server.Mobiles
{
if ( map.CanSpawnMobile( x, y, Z ) )
return new Point3D( x, y, Z );
else if ( map.CanSpawnMobile( x, y, mapZ ) )
if ( map.CanSpawnMobile( x, y, mapZ ) )
return new Point3D( x, y, mapZ );
}
}