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

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

20
Scripts/Engines/Craft/DefInscription.cs
View file

@ -36,16 +36,7 @@ namespace Server.Engines.Craft
public override int GumpTitleNumber => 1044009;
public static CraftSystem CraftSystem
{
get
{
if (m_CraftSystem == null)
m_CraftSystem = new DefInscription();
return m_CraftSystem;
}
}
public static CraftSystem CraftSystem => m_CraftSystem ?? (m_CraftSystem = new DefInscription());
public override double GetChanceAtMin(CraftItem item)
{
@ -54,7 +45,7 @@ namespace Server.Engines.Craft
public override int CanCraft(Mobile from, BaseTool tool, Type typeItem)
{
if (tool == null || tool.Deleted || tool.UsesRemaining < 0)
if (tool?.Deleted != false || tool.UsesRemaining < 0)
return 1044038; // You have worn out your tool!
if (!BaseTool.CheckAccessible(tool, from))
return 1044263; // The tool must be on your person to use.
@ -65,9 +56,7 @@ namespace Server.Engines.Craft
if (o is SpellScroll scroll)
{
Spellbook book = Spellbook.Find(from, scroll.SpellID);
bool hasSpell = book != null && book.HasSpell(scroll.SpellID);
bool hasSpell = Spellbook.Find(from, scroll.SpellID)?.HasSpell(scroll.SpellID) == true;
scroll.Delete();
@ -121,7 +110,6 @@ namespace Server.Engines.Craft
switch (m_Circle)
{
default:
case 0:
minSkill = -25.0;
maxSkill = 25.0;
break;
@ -409,4 +397,4 @@ namespace Server.Engines.Craft
SpidersSilk
}
}
}
}