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

9
Server/Items/BaseMulti.cs
View file

@ -74,8 +74,7 @@ namespace Server.Items
if ( id < 0x4000 )
return 1020000 + id;
else
return 1078872 + id;
return 1078872 + id;
}
return base.LabelNumber;
@ -129,16 +128,14 @@ namespace Server.Items
{
if ( m.Map == Map )
return Contains( m.X, m.Y );
else
return false;
return false;
}
public bool Contains( Item item )
{
if ( item.Map == Map )
return Contains( item.X, item.Y );
else
return false;
return false;
}
public override void Serialize( GenericWriter writer )

21
Server/Items/Container.cs
View file

@ -151,7 +151,7 @@ namespace Server.Items
public override void OnSnoop( Mobile from )
{
m_SnoopHandler?.Invoke( this, @from );
m_SnoopHandler?.Invoke( this, from );
}
public override bool CheckLift( Mobile from, Item item, ref LRReason reject )
@ -373,7 +373,7 @@ namespace Server.Items
{
if ( types.Length != amounts.Length )
throw new ArgumentException();
else if ( grouper == null )
if ( grouper == null )
throw new ArgumentNullException();
Item[][][] items = new Item[types.Length][][];
@ -472,7 +472,7 @@ namespace Server.Items
{
if ( types.Length != amounts.Length )
throw new ArgumentException();
else if ( grouper == null )
if ( grouper == null )
throw new ArgumentNullException();
Item[][][] items = new Item[types.Length][][];
@ -1082,7 +1082,8 @@ namespace Server.Items
{
return item;
}
else if ( recurse && item is Container )
if ( recurse && item is Container )
{
Item check = RecurseFindItemByType( item, type, recurse );
@ -1119,7 +1120,8 @@ namespace Server.Items
{
return item;
}
else if ( recurse && item is Container )
if ( recurse && item is Container )
{
Item check = RecurseFindItemByType( item, types, recurse );
@ -1464,10 +1466,8 @@ namespace Server.Items
return true;
}
else
{
return false;
}
return false;
}
public virtual bool TryDropItem( Mobile from, Item dropped, bool sendFullMessage )
@ -1873,8 +1873,7 @@ namespace Server.Items
if ( data != null )
return data;
else
return m_Default;
return m_Default;
}
private int m_GumpID;

15
Server/Items/Containers.cs
View file

@ -125,26 +125,23 @@ namespace Server.Items
public override bool IsAccessibleTo(Mobile check)
{
if ( ( check == m_Owner && m_Open ) || check.AccessLevel >= AccessLevel.GameMaster )
if ( ( check == m_Owner && m_Open ) || check.AccessLevel >= AccessLevel.GameMaster )
return base.IsAccessibleTo (check);
else
return false;
return false;
}
public override bool OnDragDrop( Mobile from, Item dropped )
{
if ( ( from == m_Owner && m_Open ) || from.AccessLevel >= AccessLevel.GameMaster )
if ( ( from == m_Owner && m_Open ) || from.AccessLevel >= AccessLevel.GameMaster )
return base.OnDragDrop( from, dropped );
else
return false;
return false;
}
public override bool OnDragDropInto(Mobile from, Item item, Point3D p)
{
if ( ( from == m_Owner && m_Open ) || from.AccessLevel >= AccessLevel.GameMaster )
if ( ( from == m_Owner && m_Open ) || from.AccessLevel >= AccessLevel.GameMaster )
return base.OnDragDropInto (from, item, p);
else
return false;
return false;
}
public override int GetTotal(TotalType type)