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/Spellweaving/ArcaneCircle.cs
View file

@ -8,7 +8,7 @@ namespace Server.Spells.Spellweaving
{
public class ArcaneCircleSpell : ArcanistSpell
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Arcane Circle",
"Myrshalee",
-1

4
Projects/UOContent/Spells/Spellweaving/AttuneWeapon.cs
View file

@ -5,13 +5,13 @@ namespace Server.Spells.Spellweaving
{
public class AttuneWeaponSpell : ArcanistSpell
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Attune Weapon",
"Haeldril",
-1
);
private static readonly Dictionary<Mobile, ExpireTimer> m_Table = new Dictionary<Mobile, ExpireTimer>();
private static readonly Dictionary<Mobile, ExpireTimer> m_Table = new();
public AttuneWeaponSpell(Mobile caster, Item scroll = null)
: base(caster, scroll, m_Info)

4
Projects/UOContent/Spells/Spellweaving/EssenceOfWind.cs
View file

@ -5,9 +5,9 @@ namespace Server.Spells.Spellweaving
{
public class EssenceOfWindSpell : ArcanistSpell
{
private static readonly SpellInfo m_Info = new SpellInfo("Essence of Wind", "Anathrae", -1);
private static readonly SpellInfo m_Info = new("Essence of Wind", "Anathrae", -1);
private static readonly Dictionary<Mobile, EssenceOfWindInfo> m_Table = new Dictionary<Mobile, EssenceOfWindInfo>();
private static readonly Dictionary<Mobile, EssenceOfWindInfo> m_Table = new();
public EssenceOfWindSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{

2
Projects/UOContent/Spells/Spellweaving/EtherealVoyage.cs
View file

@ -4,7 +4,7 @@ namespace Server.Spells.Spellweaving
{
public class EtherealVoyageSpell : ArcaneForm
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Ethereal Voyage",
"Orlavdra",
-1

6
Projects/UOContent/Spells/Spellweaving/GiftOfLife.cs
View file

@ -8,13 +8,13 @@ namespace Server.Spells.Spellweaving
{
public class GiftOfLifeSpell : ArcanistSpell, ISpellTargetingMobile
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Gift of Life",
"Illorae",
-1
);
private static readonly Dictionary<Mobile, ExpireTimer> m_Table = new Dictionary<Mobile, ExpireTimer>();
private static readonly Dictionary<Mobile, ExpireTimer> m_Table = new();
public GiftOfLifeSpell(Mobile caster, Item scroll = null)
: base(caster, scroll, m_Info)
@ -121,7 +121,7 @@ namespace Server.Spells.Spellweaving
{
var friends = pet.Friends;
for (var i = 0; friends != null && i < friends.Count; i++)
for (var i = 0; i < friends?.Count; i++)
{
var friend = friends[i];

4
Projects/UOContent/Spells/Spellweaving/GiftOfRenewal.cs
View file

@ -6,13 +6,13 @@ namespace Server.Spells.Spellweaving
{
public class GiftOfRenewalSpell : ArcanistSpell, ISpellTargetingMobile
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Gift of Renewal",
"Olorisstra",
-1
);
private static readonly Dictionary<Mobile, GiftOfRenewalInfo> m_Table = new Dictionary<Mobile, GiftOfRenewalInfo>();
private static readonly Dictionary<Mobile, GiftOfRenewalInfo> m_Table = new();
public GiftOfRenewalSpell(Mobile caster, Item scroll = null)
: base(caster, scroll, m_Info)

4
Projects/UOContent/Spells/Spellweaving/ImmolatingWeapon.cs
View file

@ -6,14 +6,14 @@ namespace Server.Spells.Spellweaving
{
public class ImmolatingWeaponSpell : ArcanistSpell
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Immolating Weapon",
"Thalshara",
-1
);
private static readonly Dictionary<BaseWeapon, ImmolatingWeaponEntry> m_WeaponDamageTable =
new Dictionary<BaseWeapon, ImmolatingWeaponEntry>();
new();
public ImmolatingWeaponSpell(Mobile caster, Item scroll = null)
: base(caster, scroll, m_Info)

2
Projects/UOContent/Spells/Spellweaving/NatureFury.cs
View file

@ -7,7 +7,7 @@ namespace Server.Spells.Spellweaving
{
public class NatureFurySpell : ArcanistSpell, ISpellTargetingPoint3D
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Nature's Fury",
"Rauvvrae",
-1,

2
Projects/UOContent/Spells/Spellweaving/ReaperForm.cs
View file

@ -5,7 +5,7 @@ namespace Server.Spells.Spellweaving
{
public class ReaperFormSpell : ArcaneForm
{
private static readonly SpellInfo m_Info = new SpellInfo("Reaper Form", "Tarisstree", -1);
private static readonly SpellInfo m_Info = new("Reaper Form", "Tarisstree", -1);
public ReaperFormSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{

2
Projects/UOContent/Spells/Spellweaving/SummonFey.cs
View file

@ -6,7 +6,7 @@ namespace Server.Spells.Spellweaving
{
public class SummonFeySpell : ArcaneSummon<ArcaneFey>
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Summon Fey",
"Alalithra",
-1

2
Projects/UOContent/Spells/Spellweaving/SummonFiend.cs
View file

@ -6,7 +6,7 @@ namespace Server.Spells.Spellweaving
{
public class SummonFiendSpell : ArcaneSummon<ArcaneFiend>
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Summon Fiend",
"Nylisstra",
-1

4
Projects/UOContent/Spells/Spellweaving/Thunderstorm.cs
View file

@ -5,13 +5,13 @@ namespace Server.Spells.Spellweaving
{
public class ThunderstormSpell : ArcanistSpell
{
private static readonly SpellInfo m_Info = new SpellInfo(
private static readonly SpellInfo m_Info = new(
"Thunderstorm",
"Erelonia",
-1
);
private static readonly Dictionary<Mobile, Timer> m_Table = new Dictionary<Mobile, Timer>();
private static readonly Dictionary<Mobile, Timer> m_Table = new();
public ThunderstormSpell(Mobile caster, Item scroll = null)
: base(caster, scroll, m_Info)

2
Projects/UOContent/Spells/Spellweaving/WordOfDeath.cs
View file

@ -5,7 +5,7 @@ namespace Server.Spells.Spellweaving
{
public class WordOfDeathSpell : ArcanistSpell, ISpellTargetingMobile
{
private static readonly SpellInfo m_Info = new SpellInfo("Word of Death", "Nyraxle", -1);
private static readonly SpellInfo m_Info = new("Word of Death", "Nyraxle", -1);
public WordOfDeathSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{