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

C# 9 Cleanup (#325)

Browse source 
- [X] Removes EventArgs - not needed
- [X] Merges sequential checks
- [X] Removes redundant type declarations
This commit is contained in:
Kamron Batman 2020-11-27 00:29:21 -08:00 • committed by GitHub
parent 351611a23a
commit 3551d962f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
417 changed files with 2209 additions and 2213 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Spells/Fourth/ArchCure.cs
View file

@ -8,7 +8,7 @@ namespace Server.Spells.Fourth
{
public class ArchCureSpell : MagerySpell, ISpellTargetingPoint3D
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Arch Cure",
"Vas An Nox",
215,

4
Projects/UOContent/Spells/Fourth/ArchProtection.cs
View file

@ -9,7 +9,7 @@ namespace Server.Spells.Fourth
{
public class ArchProtectionSpell : MagerySpell, ISpellTargetingPoint3D
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Arch Protection",
"Vas Uus Sanct",
Core.AOS ? 239 : 215,
@ -20,7 +20,7 @@ namespace Server.Spells.Fourth
Reagent.SulfurousAsh
);
private static readonly Dictionary<Mobile, int> _Table = new Dictionary<Mobile, int>();
private static readonly Dictionary<Mobile, int> _Table = new();
public ArchProtectionSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{

4
Projects/UOContent/Spells/Fourth/Curse.cs
View file

@ -5,7 +5,7 @@ namespace Server.Spells.Fourth
{
public class CurseSpell : MagerySpell, ISpellTargetingMobile
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Curse",
"Des Sanct",
227,
@ -15,7 +15,7 @@ namespace Server.Spells.Fourth
Reagent.SulfurousAsh
);
private static readonly HashSet<Mobile> m_UnderEffect = new HashSet<Mobile>();
private static readonly HashSet<Mobile> m_UnderEffect = new();
public CurseSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{

4
Projects/UOContent/Spells/Fourth/FireField.cs
View file

@ -9,7 +9,7 @@ namespace Server.Spells.Fourth
{
public class FireFieldSpell : MagerySpell, ISpellTargetingPoint3D
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Fire Field",
"In Flam Grav",
215,
@ -216,7 +216,7 @@ namespace Server.Spells.Fourth
private class InternalTimer : Timer
{
private static readonly Queue m_Queue = new Queue();
private static readonly Queue m_Queue = new();
private readonly bool m_CanFit;
private readonly bool m_InLOS;
private readonly FireFieldItem m_Item;

2
Projects/UOContent/Spells/Fourth/GreaterHeal.cs
View file

@ -8,7 +8,7 @@ namespace Server.Spells.Fourth
{
public class GreaterHealSpell : MagerySpell, ISpellTargetingMobile
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Greater Heal",
"In Vas Mani",
204,

2
Projects/UOContent/Spells/Fourth/Lightning.cs
View file

@ -4,7 +4,7 @@ namespace Server.Spells.Fourth
{
public class LightningSpell : MagerySpell, ISpellTargetingMobile
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Lightning",
"Por Ort Grav",
239,

4
Projects/UOContent/Spells/Fourth/ManaDrain.cs
View file

@ -6,7 +6,7 @@ namespace Server.Spells.Fourth
{
public class ManaDrainSpell : MagerySpell, ISpellTargetingMobile
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Mana Drain",
"Ort Rel",
215,
@ -16,7 +16,7 @@ namespace Server.Spells.Fourth
Reagent.SpidersSilk
);
private static readonly HashSet<Mobile> m_Table = new HashSet<Mobile>();
private static readonly HashSet<Mobile> m_Table = new();
public ManaDrainSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{

4
Projects/UOContent/Spells/Fourth/Recall.cs
View file

@ -8,7 +8,7 @@ namespace Server.Spells.Fourth
{
public class RecallSpell : MagerySpell, IRecallSpell
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Recall",
"Kal Ort Por",
239,
@ -78,7 +78,7 @@ namespace Server.Spells.Fourth
{
Caster.SendLocalizedMessage(501942); // That location is blocked.
}
else if (m_Book != null && m_Book.CurCharges <= 0)
else if (m_Book?.CurCharges <= 0)
{
Caster.SendLocalizedMessage(502412); // There are no charges left on that item.
}