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

Fixes implicit ternary expressions

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 14:56:48 -07:00
parent c85b0a740c
commit ff26dfa375
345 changed files with 1905 additions and 2336 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Scripts/Engines/MLQuests/MLQuest.cs
View file

@ -236,7 +236,8 @@ namespace Server.Engines.MLQuests
return false;
}
else if ( nextAvailable > DateTime.UtcNow )
if ( nextAvailable > DateTime.UtcNow )
{
if ( message )
MLQuestSystem.Tell( quester, pm, 1075575 ); // I'm sorry, but I don't have anything else for you right now. Could you check back with me in a few minutes?

8
Scripts/Engines/MLQuests/MLQuestEntry.cs
View file

@ -36,7 +36,7 @@ namespace Server.Engines.MLQuests
m_Quest = quest;
m_Quester = quester;
m_QuesterType = ( quester == null ) ? null : quester.GetType();
m_QuesterType = quester?.GetType();
m_Player = player;
m_Accepted = DateTime.UtcNow;
@ -91,7 +91,7 @@ namespace Server.Engines.MLQuests
set
{
m_Quester = value;
m_QuesterType = ( value == null ) ? null : value.GetType();
m_QuesterType = value?.GetType();
}
}
@ -156,7 +156,7 @@ namespace Server.Engines.MLQuests
if ( complete && !requiresAll )
return true;
else if ( !complete && requiresAll )
if ( !complete && requiresAll )
return false;
}
@ -369,7 +369,7 @@ namespace Server.Engines.MLQuests
foreach ( Item rewardItem in rewards )
{
string rewardName = ( rewardItem.Name != null ) ? rewardItem.Name : string.Concat( "#", rewardItem.LabelNumber );
string rewardName = rewardItem.Name ?? string.Concat( "#", rewardItem.LabelNumber );
if ( rewardItem.Stackable )
m_Player.SendLocalizedMessage( 1115917, string.Concat( rewardItem.Amount, "\t", rewardName ) ); // You receive a reward: ~1_QUANTITY~ ~2_ITEM~

2
Scripts/Engines/MLQuests/MLQuestSystem.cs
View file

@ -376,7 +376,7 @@ namespace Server.Engines.MLQuests
if ( entry.Failed )
return; // Note: OSI sends no gump at all for failed quests, they have to be cancelled in the quest overview
else if ( entry.ClaimReward )
if ( entry.ClaimReward )
entry.SendRewardOffer();
else if ( entry.IsCompleted() )
entry.SendReportBackGump();

3
Scripts/Engines/MLQuests/Objectives/CollectObjective.cs
View file

@ -65,8 +65,7 @@ namespace Server.Engines.MLQuests.Objectives
{
if ( label < 1078872 )
return ( label - 1020000 );
else
return ( label - 1078872 );
return ( label - 1078872 );
}
public override void WriteToGump( Gump g, ref int y )