Fixes more casting and other formatting issues.

This commit is contained in:
Kamron Batman 2018-08-19 10:14:40 +08:00
parent 03dd5f1926
commit 61937d9c97
67 changed files with 325 additions and 570 deletions

View file

@ -28,9 +28,7 @@ namespace Server.Engines.Quests
if ( m_Quest == null )
return true;
PlayerMobile player = m as PlayerMobile;
if ( player != null && player.Quest != null && player.Quest.GetType() == m_Quest )
if ( m is PlayerMobile player && player.Quest != null && player.Quest.GetType() == m_Quest )
{
if ( !player.HasGump( typeof( QuestCancelGump ) ) )
player.Quest.BeginCancelQuest();
@ -41,4 +39,4 @@ namespace Server.Engines.Quests
return true;
}
}
}
}

View file

@ -28,9 +28,7 @@ namespace Server.Engines.Quests
if ( m_Quest != null && m_Objective != null )
{
PlayerMobile player = m as PlayerMobile;
if ( player != null && player.Quest != null && player.Quest.GetType() == m_Quest )
if ( m is PlayerMobile player && player.Quest != null && player.Quest.GetType() == m_Quest )
{
QuestObjective obj = player.Quest.FindObjective( m_Objective );
@ -40,4 +38,4 @@ namespace Server.Engines.Quests
}
}
}
}
}

View file

@ -36,32 +36,23 @@ namespace Server.Engines.Quests
if ( m.AccessLevel > AccessLevel.Player )
return true;
if ( m is BaseCreature )
{
BaseCreature bc = m as BaseCreature;
if ( !bc.Controlled && !bc.Summoned )
return true;
}
if ( m is BaseCreature bc && !bc.Controlled && !bc.Summoned )
return true;
if ( m_Quest == null )
return true;
PlayerMobile player = m as PlayerMobile;
if ( player != null && player.Quest != null && player.Quest.GetType() == m_Quest
if ( m is PlayerMobile player && player.Quest != null && player.Quest.GetType() == m_Quest
&& ( m_MinObjective == null || player.Quest.FindObjective( m_MinObjective ) != null )
&& ( m_MaxObjective == null || player.Quest.FindObjective( m_MaxObjective ) == null ) )
{
return true;
}
else
{
if ( m_Message != 0 )
m.SendLocalizedMessage( m_Message );
return false;
}
if ( m_Message != 0 )
m.SendLocalizedMessage( m_Message );
return false;
}
}
}

View file

@ -24,9 +24,7 @@ namespace Server.Engines.Quests
if ( m_Quest == null )
return;
PlayerMobile player = m as PlayerMobile;
if ( player != null && player.Quest == null && QuestSystem.CanOfferQuest( m, m_Quest ) )
if ( m is PlayerMobile player && player.Quest == null && QuestSystem.CanOfferQuest( m, m_Quest ) )
{
try
{
@ -40,4 +38,4 @@ namespace Server.Engines.Quests
}
}
}
}
}