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

7
Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/AncientSmithyHammer.cs
View file

@ -9,12 +9,7 @@ namespace Server.Items
private SkillMod m_SkillMod;
[Constructible]
public AncientSmithyHammer(int bonus) : this(bonus, 600)
{
}
[Constructible]
public AncientSmithyHammer(int bonus, int uses) : base(uses, 0x13E4)
public AncientSmithyHammer(int bonus, int uses = 600) : base(uses, 0x13E4)
{
m_Bonus = bonus;
Weight = 8.0;

11
Scripts/Items/Special/Bulk Order Rewards/Blacksmithy/PowderOfTemperament.cs
View file

@ -8,12 +8,7 @@ namespace Server.Items
private int m_UsesRemaining;
[Constructible]
public PowderOfTemperament() : this(10)
{
}
[Constructible]
public PowderOfTemperament(int charges) : base(4102)
public PowderOfTemperament(int charges = 10) : base(4102)
{
Weight = 1.0;
Hue = 2419;
@ -105,7 +100,7 @@ namespace Server.Items
protected override void OnTarget(Mobile from, object targeted)
{
if (m_Powder.Deleted || m_Powder.UsesRemaining <= 0)
if (m_Powder?.Deleted != false || m_Powder.UsesRemaining <= 0)
{
from.SendLocalizedMessage(1049086); // You have used up your powder of temperament.
return;
@ -189,4 +184,4 @@ namespace Server.Items
}
}
}
}
}