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

17
Projects/UOContent/Spells/Sixth/Mark.cs
View file

@ -24,7 +24,7 @@ namespace Server.Spells.Sixth
public void Target(Item item)
{
if (!(item is RecallRune rune))
if (item is not RecallRune rune)
{
Caster.NetState.SendMessageLocalized(
Caster.Serial,
@ -32,13 +32,9 @@ namespace Server.Spells.Sixth
MessageType.Regular,
0x3B2,
3,
501797,
501797, // I cannot mark that object.
Caster.Name
); // I cannot mark that object.
}
else if (!Caster.CanSee(rune))
{
Caster.SendLocalizedMessage(500237); // Target can not be seen.
);
}
else if (!SpellHelper.CheckTravel(Caster, TravelCheckType.Mark))
{
@ -49,11 +45,8 @@ namespace Server.Spells.Sixth
}
else if (!rune.IsChildOf(Caster.Backpack))
{
Caster.LocalOverheadMessage(
MessageType.Regular,
0x3B2,
1062422
); // You must have this rune in your backpack in order to mark it.
// You must have this rune in your backpack in order to mark it.
Caster.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1062422);
}
else if (CheckSequence())
{