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

11
Projects/UOContent/Spells/Second/Agility.cs
View file

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

11
Projects/UOContent/Spells/Second/Cunning.cs
View file

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

11
Projects/UOContent/Spells/Second/Cure.cs
View file

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

11
Projects/UOContent/Spells/Second/Harm.cs
View file

@ -23,16 +23,7 @@ namespace Server.Spells.Second
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);

4
Projects/UOContent/Spells/Second/MagicTrap.cs
View file

@ -27,10 +27,6 @@ namespace Server.Spells.Second
{
Caster.SendLocalizedMessage(502942); // You can't trap this!
}
else if (!Caster.CanSee(item))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
}
else if (cont.TrapType != TrapType.None && cont.TrapType != TrapType.MagicTrap)
{
DoFizzle();

8
Projects/UOContent/Spells/Second/RemoveTrap.cs
View file

@ -22,13 +22,9 @@ namespace Server.Spells.Second
public void Target(Item item)
{
if (!(item is TrappableContainer cont))
if (item is not TrappableContainer cont)
{
Caster.SendMessage("You can't disarm that"); // TODO: Localization?
}
else if (!Caster.CanSee(item))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
Caster.SendLocalizedMessage(502373); // That doesn't appear to be trapped
}
else if (cont.TrapType != TrapType.None && cont.TrapType != TrapType.MagicTrap)
{

11
Projects/UOContent/Spells/Second/Strength.cs
View file

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