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
Scripts/Engines/Factions/Core/Faction.cs
View file

@ -830,7 +830,7 @@ namespace Server.Factions
sigil.GraceStart = DateTime.MinValue;
}
if ( sigil.LastMonolith == null || sigil.LastMonolith.Sigil == null )
if ( sigil.LastMonolith?.Sigil == null )
{
if ( (sigil.LastStolen + Sigil.ReturnPeriod) < DateTime.UtcNow )
sigil.ReturnHome();

4
Scripts/Engines/Factions/Core/FactionState.cs
View file

@ -118,10 +118,10 @@ namespace Server.Factions
PlayerState pl = PlayerState.Find( m_Commander );
if ( pl != null && pl.Finance != null )
if ( pl?.Finance != null )
pl.Finance.Finance = null;
if ( pl != null && pl.Sheriff != null )
if ( pl?.Sheriff != null )
pl.Sheriff.Sheriff = null;
}
}

2
Scripts/Engines/Factions/Gumps/FactionGump.cs
View file

@ -37,7 +37,7 @@ namespace Server.Factions
{
if ( text != null && text.Number > 0 )
AddHtmlLocalized( x, y, width, height, text.Number, back, scroll );
else if ( text != null && text.String != null )
else if ( text?.String != null )
AddHtml( x, y, width, height, text.String, back, scroll );
}

2
Scripts/Engines/Factions/Gumps/FactionStoneGump.cs
View file

@ -104,7 +104,7 @@ namespace Server.Factions
BaseMonolith monolith = town.Monolith;
AddImage( 20, 60 + (i * 30), ( monolith != null && monolith.Sigil != null && monolith.Sigil.IsPurifying ) ? 0x938 : 0x939 );
AddImage( 20, 60 + (i * 30), ( monolith?.Sigil != null && monolith.Sigil.IsPurifying ) ? 0x938 : 0x939 );
}
}

2
Scripts/Engines/Factions/Items/BaseMonolith.cs
View file

@ -19,7 +19,7 @@ namespace Server.Factions
m_Sigil = value;
if ( m_Sigil != null && m_Sigil.LastMonolith != null && m_Sigil.LastMonolith != this && m_Sigil.LastMonolith.Sigil == m_Sigil )
if ( m_Sigil?.LastMonolith != null && m_Sigil.LastMonolith != this && m_Sigil.LastMonolith.Sigil == m_Sigil )
m_Sigil.LastMonolith.Sigil = null;
if ( m_Sigil != null )

2
Scripts/Engines/Factions/Items/BaseSystemController.cs
View file

@ -25,7 +25,7 @@ namespace Server.Factions
m_LabelNumber = name.Number;
Name = null;
}
else if ( name != null && name.String != null )
else if ( name?.String != null )
{
m_LabelNumber = 0;
Name = name.String;

2
Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs
View file

@ -138,7 +138,7 @@ namespace Server.Factions
if ( def != null && def.Number > 0 )
Say( def.Number );
else if ( def != null && def.String != null )
else if ( def?.String != null )
Say( def.String );
}