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

18
Scripts/Spells/Chivalry/DispelEvil.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Items;
using Server.Mobiles;
using Server.Spells.Necromancy;
@ -14,7 +15,7 @@ namespace Server.Spells.Chivalry
9002
);
public DispelEvilSpell(Mobile caster, Item scroll) : base(caster, scroll, m_Info)
public DispelEvilSpell(Mobile caster, Item scroll = null) : base(caster, scroll, m_Info)
{
}
@ -37,12 +38,6 @@ namespace Server.Spells.Chivalry
{
if (CheckSequence())
{
List<Mobile> targets = new List<Mobile>();
foreach (Mobile m in Caster.GetMobilesInRange(8))
if (Caster != m && SpellHelper.ValidIndirectTarget(Caster, m) && Caster.CanBeHarmful(m, false))
targets.Add(m);
Caster.PlaySound(0xF5);
Caster.PlaySound(0x299);
Caster.FixedParticles(0x37C4, 1, 25, 9922, 14, 3, EffectLayer.Head);
@ -51,10 +46,11 @@ namespace Server.Spells.Chivalry
double chiv = Caster.Skills.Chivalry.Value;
for (int i = 0; i < targets.Count; ++i)
{
Mobile m = targets[i];
IEnumerable<Mobile> targets = Caster.GetMobilesInRange(8)
.Where(m => Caster != m && SpellHelper.ValidIndirectTarget(Caster, m) && Caster.CanBeHarmful(m, false));
foreach (Mobile m in targets)
{
if (m is BaseCreature bc)
{
if (bc.Summoned && !bc.IsAnimatedDead)
@ -106,4 +102,4 @@ namespace Server.Spells.Chivalry
FinishSequence();
}
}
}
}