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

Fixes casting checks

Browse source
This commit is contained in:
Kamron Batman 2018-08-19 01:38:55 +08:00
parent 7ea00fbf4f
commit 03dd5f1926
431 changed files with 5616 additions and 6250 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Scripts/Engines/ConPVP/AcceptDuelGump.cs
View file

@ -197,9 +197,7 @@ namespace Server.Engines.ConPVP
if ( info.IsSwitched( 1 ) )
{
PlayerMobile pm = m_Challenged as PlayerMobile;
if ( pm == null )
if ( !(m_Challenged is PlayerMobile pm) )
return;
if ( pm.DuelContext != null )
@ -254,25 +252,15 @@ namespace Server.Engines.ConPVP
{
foreach ( Gump g in ns.Gumps )
{
if ( g is ParticipantGump )
if ( g is ParticipantGump pg && pg.Participant == m_Participant )
{
ParticipantGump pg = (ParticipantGump)g;
if ( pg.Participant == m_Participant )
{
m_Challenger.SendGump( new ParticipantGump( m_Challenger, m_Context, m_Participant ) );
break;
}
m_Challenger.SendGump( new ParticipantGump( m_Challenger, m_Context, m_Participant ) );
break;
}
else if ( g is DuelContextGump )
if ( g is DuelContextGump dcg && dcg.Context == m_Context )
{
DuelContextGump dcg = (DuelContextGump)g;
if ( dcg.Context == m_Context )
{
m_Challenger.SendGump( new DuelContextGump( m_Challenger, m_Context ) );
break;
}
m_Challenger.SendGump( new DuelContextGump( m_Challenger, m_Context ) );
break;
}
}
}
@ -294,4 +282,4 @@ namespace Server.Engines.ConPVP
}
}
}
}
}