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

fix(spells): Fixes an edge case with casters current map (#643)

Browse source
This commit is contained in:
Kamron Batman 2021-06-04 23:41:43 -07:00 • committed by GitHub
parent 7ddf2b1a8f
commit ac4d349caa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Projects/UOContent/Spells/Base/SpellHelper.cs
View file

@ -666,8 +666,8 @@ namespace Server.Spells
}
// Always allow monsters to teleport
if (caster is BaseCreature bc && !bc.Controlled && !bc.Summoned &&
(type == TravelCheckType.TeleportTo || type == TravelCheckType.TeleportFrom))
if (caster is BaseCreature { Controlled: false, Summoned: false } &&
type is TravelCheckType.TeleportTo or TravelCheckType.TeleportFrom)
{
return true;
}
@ -681,7 +681,7 @@ namespace Server.Spells
if (caster != null)
{
var destination = Region.Find(loc, map) as BaseRegion;
var current = Region.Find(caster.Location, map) as BaseRegion;
var current = Region.Find(caster.Location, caster.Map) as BaseRegion;
if (destination?.CheckTravel(caster, loc, type) == false || current?.CheckTravel(caster, loc, type) == false)
{