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

fix: Removes duplicative spell checks (#849)

Browse source
This commit is contained in:
Kamron Batman 2021-11-14 18:45:16 -08:00 • committed by GitHub
parent e5f55a424a
commit 5df7bf6a75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 78 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,11 +29,7 @@ namespace Server.Spells.Fourth
public void Target(IPoint3D p)
{
if (!Caster.CanSee(p))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (CheckSequence())
if (CheckSequence())
{
SpellHelper.Turn(Caster, p);

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

@ -30,11 +30,7 @@ namespace Server.Spells.Fourth
public void Target(IPoint3D p)
{
if (!Caster.CanSee(p))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (CheckSequence())
if (CheckSequence())
{
SpellHelper.Turn(Caster, p);

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

@ -25,16 +25,7 @@ namespace Server.Spells.Fourth
public void Target(Mobile m)
{
if (m == null)
{
return;
}
if (!Caster.CanSee(m))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (CheckHSequence(m))
if (CheckHSequence(m))
{
SpellHelper.Turn(Caster, m);
@ -46,8 +37,8 @@ namespace Server.Spells.Fourth
SpellHelper.AddStatCurse(Caster, m, StatType.Int);
SpellHelper.DisableSkillCheck = false;
if (Caster.Player && m.Player /*&& Caster != m */ && !UnderEffect(m)
) // On OSI you CAN curse yourself and get this effect.
// On OSI you CAN curse yourself and get this effect.
if (Caster.Player && m.Player /*&& Caster != m */ && !UnderEffect(m))
{
var duration = SpellHelper.GetDuration(Caster, m);
m_UnderEffect.Add(m);

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

@ -28,11 +28,7 @@ namespace Server.Spells.Fourth
public void Target(IPoint3D p)
{
if (!Caster.CanSee(p))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
if (SpellHelper.CheckTown(p, Caster) && CheckSequence())
{
SpellHelper.Turn(Caster, p);

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

@ -27,16 +27,7 @@ namespace Server.Spells.Fourth
public void Target(Mobile m)
{
if (m == null)
{
return;
}
if (!Caster.CanSee(m))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (m is BaseCreature creature && creature.IsAnimatedDead)
if (m is BaseCreature creature && creature.IsAnimatedDead)
{
Caster.SendLocalizedMessage(1061654); // You cannot heal that which is not alive.
}

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

@ -23,16 +23,7 @@ namespace Server.Spells.Fourth
public void Target(Mobile m)
{
if (m == null)
{
return;
}
if (!Caster.CanSee(m))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (CheckHSequence(m))
if (CheckHSequence(m))
{
SpellHelper.Turn(Caster, m);

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

@ -26,16 +26,7 @@ namespace Server.Spells.Fourth
public void Target(Mobile m)
{
if (m == null)
{
return;
}
if (!Caster.CanSee(m))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (CheckHSequence(m))
if (CheckHSequence(m))
{
SpellHelper.Turn(Caster, m);