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

More cast conversion fixes

Browse source
This commit is contained in:
Kamron Batman 2018-09-06 18:07:42 -07:00
parent 3f45bd57b9
commit aba9452161
46 changed files with 359 additions and 506 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -165,9 +165,7 @@ namespace Server.Items
public static BaseInstrument GetInstrument( Mobile from )
{
BaseInstrument item = m_Instruments[from] as BaseInstrument;
if ( item == null )
if ( !(m_Instruments[@from] is BaseInstrument item) )
return null;
if ( !item.IsChildOf( from.Backpack ) )
@ -202,9 +200,7 @@ namespace Server.Items
public static void OnPickedInstrument( Mobile from, object targeted, object state )
{
BaseInstrument instrument = targeted as BaseInstrument;
if ( instrument == null )
if ( !(targeted is BaseInstrument instrument) )
{
from.SendLocalizedMessage( 500619 ); // That is not a musical instrument.
}
@ -214,8 +210,7 @@ namespace Server.Items
InstrumentPickedCallback callback = state as InstrumentPickedCallback;
if ( callback != null )
callback( from, instrument );
callback?.Invoke( @from, instrument );
}
}