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

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

@ -212,10 +212,8 @@ namespace Server.Items
m_From.NameMod = NameList.RandomName( m_From.Female ? "female" : "male" );
if ( m_From is PlayerMobile )
if ( m_From is PlayerMobile pm )
{
PlayerMobile pm = (PlayerMobile)m_From;
if ( hair )
pm.SetHairMods( entry.m_ItemID, -2 );
else
@ -297,10 +295,10 @@ namespace Server.Items
{
m_Player.NameMod = null;
if ( m_Player is PlayerMobile )
((PlayerMobile)m_Player).SetHairMods( -1, -1 );
if ( m_Player is PlayerMobile mobile )
mobile.SetHairMods( -1, -1 );
DisguiseTimers.RemoveTimer( m_Player );
RemoveTimer( m_Player );
}
}

14
Scripts/Items/Skill Items/Thief/LockPick.cs
View file

@ -73,16 +73,16 @@ namespace Server.Items
if ( m_Item.Deleted )
return;
if ( targeted is ILockpickable )
if ( targeted is ILockpickable lockpickable )
{
Item item = (Item)targeted;
Item item = lockpickable as Item;
from.Direction = from.GetDirectionTo( item );
if ( ((ILockpickable)targeted).Locked )
if ( lockpickable.Locked )
{
from.PlaySound( 0x241 );
new InternalTimer( from, (ILockpickable)targeted, m_Item ).Start();
new InternalTimer( from, lockpickable, m_Item ).Start();
}
else
{
@ -101,7 +101,7 @@ namespace Server.Items
private Mobile m_From;
private ILockpickable m_Item;
private Lockpick m_Lockpick;
public InternalTimer( Mobile from, ILockpickable item, Lockpick lockpick ) : base( TimeSpan.FromSeconds( 3.0 ) )
{
m_From = from;
@ -124,7 +124,7 @@ namespace Server.Items
m_Lockpick.Consume();
}
}
protected override void OnTick()
{
Item item = (Item)m_Item;
@ -168,4 +168,4 @@ namespace Server.Items
}
}
}
}
}