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

11
Scripts/Skills/Stealing.cs
View file

@ -115,7 +115,7 @@ namespace Server.SkillHandlers
{
m_Thief.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (m_Thief.Backpack == null || !m_Thief.Backpack.CheckHold(m_Thief, toSteal, false, true))
else if (m_Thief.Backpack?.CheckHold(m_Thief, toSteal, false, true) != true)
{
m_Thief.SendLocalizedMessage(1048147); // Your backpack can't hold anything else.
}
@ -177,7 +177,7 @@ namespace Server.SkillHandlers
m_Thief.SendLocalizedMessage(
1010258); // The sigil has gone back to its home location because you already have a sigil.
}
else if (m_Thief.Backpack == null || !m_Thief.Backpack.CheckHold(m_Thief, sig, false, true))
else if (m_Thief?.Backpack.CheckHold(m_Thief, sig, false, true) != true)
{
m_Thief.SendLocalizedMessage(
1010259); // The sigil has gone home because your backpack is full
@ -289,10 +289,7 @@ namespace Server.SkillHandlers
if (m_Thief.CheckTargetSkill(SkillName.Stealing, toSteal, pileWeight - 22.5,
pileWeight + 27.5))
{
stolen = Mobile.LiftItemDupe(toSteal, toSteal.Amount - amount);
if (stolen == null)
stolen = toSteal;
stolen = Mobile.LiftItemDupe(toSteal, toSteal.Amount - amount) ?? toSteal;
}
}
}
@ -344,7 +341,7 @@ namespace Server.SkillHandlers
{
Container pack = mobile.Backpack;
if (pack != null && pack.Items.Count > 0)
if (pack?.Items.Count > 0)
{
int randomIndex = Utility.Random(pack.Items.Count);