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

Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)

Browse source
This commit is contained in:
Kamron Batman 2019-03-11 14:29:59 -07:00 • committed by GitHub
parent e748af4430
commit 513e54f70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1094 changed files with 15913 additions and 21892 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -302,7 +302,7 @@ namespace Server.Engines.MLQuests
public void ClaimRewards()
{
if (Quest == null || Player == null || Player.Deleted || !ClaimReward || Removed)
if (Quest == null || Player?.Deleted != false || !ClaimReward || Removed)
return;
List<Item> rewards = new List<Item>();
@ -400,11 +400,10 @@ namespace Server.Engines.MLQuests
private void StopTimer()
{
if (m_Timer != null)
{
m_Timer.Stop();
m_Timer = null;
}
if (m_Timer == null)
return;
m_Timer.Stop();
m_Timer = null;
}
public void OnQuesterDeleted()
@ -442,10 +441,7 @@ namespace Server.Engines.MLQuests
MLQuestSystem.WriteQuestRef(writer, Quest);
if (m_Quester == null || m_Quester.Deleted)
writer.Write(Serial.MinusOne);
else
writer.Write(m_Quester.Serial);
writer.Write(m_Quester?.Deleted != false ? Serial.MinusOne : m_Quester.Serial);
writer.Write(ClaimReward);
writer.Write(Objectives.Length);
@ -485,4 +481,4 @@ namespace Server.Engines.MLQuests
return instance;
}
}
}
}