fix: Fixes travel restriction messages (#1263)

- [X] `BaseRegion.CheckTravel` now properly cascades through parent regions
- [X] `SpellHelper.CheckTravel` now returns a failure message instead of sending one internally.
- [X] Consolidates travel restriction messages so they aren't duplicated.
This commit is contained in:
Kamron Batman 2022-11-22 16:57:42 -08:00 • committed by GitHub
parent 2057fe74a2
commit 1d8e8ec0a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 121 additions and 69 deletions

View file

@ -35,8 +35,9 @@ namespace Server.Spells.Sixth
Caster.Name
);
}
else if (!SpellHelper.CheckTravel(Caster, TravelCheckType.Mark))
else if (!SpellHelper.CheckTravel(Caster, TravelCheckType.Mark, out var failureMessage))
{
failureMessage.SendMessageTo(Caster);
}
else if (SpellHelper.CheckMulti(Caster.Location, Caster.Map, !Core.AOS))
{
@ -63,6 +64,20 @@ namespace Server.Spells.Sixth
Caster.Target = new SpellTargetItem(this, range: Core.ML ? 10 : 12);
}
public override bool CheckCast() => base.CheckCast() && SpellHelper.CheckTravel(Caster, TravelCheckType.Mark);
public override bool CheckCast()
{
if (base.CheckCast())
{
return true;
}
if (!SpellHelper.CheckTravel(Caster, TravelCheckType.Mark, out var failureMessage))
{
failureMessage.SendMessageTo(Caster);
return false;
}
return true;
}
}
}