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

23
Scripts/Spells/Spellweaving/ArcanistSpell.cs
View file

@ -27,32 +27,17 @@ namespace Server.Spells.Spellweaving
{
ArcaneFocus focus = FindArcaneFocus(from);
if (focus == null || focus.Deleted)
return 0;
return focus.StrengthBonus;
return focus?.Deleted != false ? 0 : focus.StrengthBonus;
}
public static ArcaneFocus FindArcaneFocus(Mobile from)
{
if (from?.Backpack == null)
return null;
if (from.Holding is ArcaneFocus focus)
return focus;
return from.Backpack.FindItemByType<ArcaneFocus>();
return from.Holding as ArcaneFocus ?? from.Backpack?.FindItemByType<ArcaneFocus>();
}
public static bool CheckExpansion(Mobile from)
{
if (!(from is PlayerMobile))
return true;
if (from.NetState == null)
return false;
return from.NetState.SupportsExpansion(Expansion.ML);
return !(from is PlayerMobile) || from.NetState?.SupportsExpansion(Expansion.ML) == true;
}
public override bool CheckCast()
@ -158,4 +143,4 @@ namespace Server.Spells.Spellweaving
return percent >= Utility.RandomDouble();
}
}
}
}