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

Fixes more casting and null propogation

Browse source
This commit is contained in:
Kamron Batman 2018-09-11 16:20:57 -07:00
parent 403e2a8b9d
commit f211efc3bd
7 changed files with 242 additions and 412 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Scripts/Mobiles/Animals/Mounts/BaseMount.cs
View file

@ -59,9 +59,7 @@ namespace Server.Mobiles
public override void OnAfterDelete()
{
if ( m_InternalItem != null )
m_InternalItem.Delete();
m_InternalItem?.Delete();
m_InternalItem = null;
base.OnAfterDelete();
@ -196,10 +194,7 @@ namespace Server.Mobiles
{
get
{
if ( m_InternalItem != null )
return m_InternalItem.ItemID;
else
return 0;
return m_InternalItem?.ItemID ?? 0;
}
set
{
@ -242,8 +237,7 @@ namespace Server.Mobiles
Location = loc;
Map = map;
if ( m_InternalItem != null )
m_InternalItem.Internalize();
m_InternalItem?.Internalize();
}
else
{
@ -280,10 +274,9 @@ namespace Server.Mobiles
{
bool result = true;
if ((mob is PlayerMobile) && (mob as PlayerMobile).MountBlockReason != BlockMountType.None)
if ((mob is PlayerMobile mobile) && mobile.MountBlockReason != BlockMountType.None)
{
mob.SendLocalizedMessage((int)(mob as PlayerMobile).MountBlockReason);
mobile.SendLocalizedMessage((int)mobile.MountBlockReason);
result = false;
}
@ -333,9 +326,7 @@ namespace Server.Mobiles
public override void OnAfterDelete()
{
if ( m_Mount != null )
m_Mount.Delete();
m_Mount?.Delete();
m_Mount = null;
base.OnAfterDelete();

3
Scripts/Mobiles/Animals/Mounts/Ethereals.cs
View file

@ -345,8 +345,7 @@ namespace Server.Mobiles
public static void StopMounting( Mobile mob )
{
if ( mob.Spell is EtherealSpell )
( (EtherealSpell)mob.Spell ).Stop();
(mob.Spell as EtherealSpell)?.Stop();
}
public void OnRiderDamaged( int amount, Mobile from, bool willKill )