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

Fixes null propogation

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

24
Scripts/Items/Skill Items/Blacksmith Items/Misc/LargeForge.cs
View file

@ -39,10 +39,8 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
if ( m_Item2 != null )
m_Item2.Delete();
m_Item?.Delete();
m_Item2?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -97,8 +95,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -152,8 +149,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -215,10 +211,8 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
if ( m_Item2 != null )
m_Item2.Delete();
m_Item?.Delete();
m_Item2?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -273,8 +267,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -328,8 +321,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Item != null )
m_Item.Delete();
m_Item?.Delete();
}
public override void Serialize( GenericWriter writer )

6
Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs
View file

@ -206,8 +206,7 @@ namespace Server.Items
{
base.OnAfterDelete();
if ( m_Timer != null )
m_Timer.Stop();
m_Timer?.Stop();
}
public InternalItem( Serial serial ) : base( serial )
@ -316,8 +315,7 @@ namespace Server.Items
if ( (m.Z + 16) > m_Item.Z && (m_Item.Z + 12) > m.Z && (!Core.AOS || m != from) && SpellHelper.ValidIndirectTarget( from, m ) && from.CanBeHarmful( m, false ) )
{
if ( from != null )
from.DoHarmful( m );
@from?.DoHarmful( m );
AOS.Damage( m, from, m_Item.GetDamage(), 0, 100, 0, 0, 0 );
m.PlaySound( 0x208 );

3
Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -104,8 +104,7 @@ namespace Server.Items
Spellbook book = Find( from, -1, type );
if ( book != null )
book.DisplayTo( from );
book?.DisplayTo( @from );
}
private static void EventSink_CastSpellRequest( CastSpellRequestEventArgs e )

11
Scripts/Items/Skill Items/Musical Instruments/BaseInstrument.cs
View file

@ -153,8 +153,7 @@ namespace Server.Items
}
else
{
if ( from != null )
from.SendLocalizedMessage( 502079 ); // The instrument played its last tune.
@from?.SendLocalizedMessage( 502079 ); // The instrument played its last tune.
Delete();
}
@ -187,8 +186,7 @@ namespace Server.Items
if ( instrument != null )
{
if ( callback != null )
callback( from, instrument );
callback?.Invoke( @from, instrument );
}
else
{
@ -233,10 +231,7 @@ namespace Server.Items
public static int GetPoisonLevel( BaseCreature bc )
{
if ( bc == null )
return 0;
Poison p = bc.HitPoison;
Poison p = bc?.HitPoison;
if ( p == null )
return 0;

3
Scripts/Items/Skill Items/Thief/DisguiseKit.cs
View file

@ -309,8 +309,7 @@ namespace Server.Items
{
m_Timers.TryGetValue( m, out Timer t );
if ( t != null )
t.Start();
t?.Start();
}
public static bool IsDisguised( Mobile m )

10
Scripts/Items/Skill Items/Tools/BaseRunicTool.cs
View file

@ -239,10 +239,7 @@ namespace Server.Items
{
CraftResourceInfo resInfo = CraftResources.GetInfo( m_Resource );
if ( resInfo == null )
return;
CraftAttributeInfo attrs = resInfo.AttributeInfo;
CraftAttributeInfo attrs = resInfo?.AttributeInfo;
if ( attrs == null )
return;
@ -438,10 +435,7 @@ namespace Server.Items
{
CraftResourceInfo resInfo = CraftResources.GetInfo( m_Resource );
if ( resInfo == null )
return;
CraftAttributeInfo attrs = resInfo.AttributeInfo;
CraftAttributeInfo attrs = resInfo?.AttributeInfo;
if ( attrs == null )
return;