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

Fixes sequential checks

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 13:00:41 -07:00
parent 83dcf536d8
commit 42d0b6271f
67 changed files with 99 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Server/Body.cs
View file

@ -183,7 +183,7 @@ namespace Server
public override bool Equals( object o )
{
if ( o == null || !(o is Body) ) return false;
if ( !(o is Body) ) return false;
return ((Body)o).m_BodyID == m_BodyID;
}

2
Server/Items/Containers.cs
View file

@ -148,7 +148,7 @@ namespace Server.Items
public override int GetTotal(TotalType type)
{
if (AccountGold.Enabled && Owner != null && Owner.Account != null && type == TotalType.Gold)
if (AccountGold.Enabled && Owner?.Account != null && type == TotalType.Gold)
{
return Owner.Account.TotalGold;
}

4
Server/Items/VirtualCheck.cs
View file

@ -87,7 +87,7 @@ namespace Server
{
if (UseEditGump && IsAccessibleTo(from))
{
if (Editor == null || Editor.Check == null || Editor.Check.Deleted)
if (Editor?.Check == null || Editor.Check.Deleted)
{
Editor = new EditGump(from, this);
Editor.Send();
@ -125,7 +125,7 @@ namespace Server
{
var c = GetSecureTradeCont();
if (c == null || c.Trade == null)
if (c?.Trade == null)
{
return;
}

2
Server/Map.cs
View file

@ -70,7 +70,7 @@ namespace Server
public static IEnumerable<NetState> SelectClients(Sector s, Rectangle2D bounds)
{
return s.Clients.Where(o => o != null && o.Mobile != null && !o.Mobile.Deleted && bounds.Contains(o.Mobile));
return s.Clients.Where(o => o?.Mobile != null && !o.Mobile.Deleted && bounds.Contains(o.Mobile));
}
public static IEnumerable<IEntity> SelectEntities(Sector s, Rectangle2D bounds)

2
Server/Network/PacketHandlers.cs
View file

@ -1610,7 +1610,7 @@ namespace Server.Network
bool rightClick = pvSrc.ReadBoolean();
Mobile from = state.Mobile;
if ( from != null && from.QuestArrow != null )
if ( @from?.QuestArrow != null )
from.QuestArrow.OnClick( rightClick );
}