Fixes null propogation

This commit is contained in:
Kamron Batman 2018-09-14 13:49:23 -07:00
parent 22ab83ea9e
commit 3c9842ee5a
218 changed files with 799 additions and 1458 deletions

View file

@ -368,8 +368,7 @@ namespace Server.Items
public void BeginDecay( TimeSpan delay )
{
if ( m_DecayTimer != null )
m_DecayTimer.Stop();
m_DecayTimer?.Stop();
m_DecayTime = DateTime.UtcNow + delay;
@ -379,8 +378,7 @@ namespace Server.Items
public override void OnAfterDelete()
{
if ( m_DecayTimer != null )
m_DecayTimer.Stop();
m_DecayTimer?.Stop();
m_DecayTimer = null;
}

View file

@ -19,8 +19,7 @@ namespace Server.Items
public void BeginDecay( TimeSpan delay )
{
if ( m_DecayTimer != null )
m_DecayTimer.Stop();
m_DecayTimer?.Stop();
m_DecayTime = DateTime.UtcNow + delay;
@ -30,8 +29,7 @@ namespace Server.Items
public override void OnAfterDelete()
{
if ( m_DecayTimer != null )
m_DecayTimer.Stop();
m_DecayTimer?.Stop();
m_DecayTimer = null;
}

View file

@ -62,8 +62,7 @@ namespace Server.Items
if ( !Active )
{
if ( boat.TillerMan != null )
boat.TillerMan.Say( 502507 ); // Ar, Legend has it that these pillars are inactive! No man knows how it might be undone!
boat.TillerMan?.Say( 502507 ); // Ar, Legend has it that these pillars are inactive! No man knows how it might be undone!
return;
}
@ -90,8 +89,7 @@ namespace Server.Items
}
}
if ( boat.TillerMan != null )
boat.TillerMan.Say( 502508 ); // Ar, I refuse to take that matey through here!
boat.TillerMan?.Say( 502508 ); // Ar, I refuse to take that matey through here!
}
}

View file

@ -862,8 +862,7 @@ namespace Server.Items
public override bool OnMoveOver(Mobile m)
{
if (m_Teleporter != null)
m_Teleporter.StopTimer(m);
m_Teleporter?.StopTimer(m);
return true;
}