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

fix: Fixes bad movement checks (#960)

Browse source
This commit is contained in:
Kamron Batman 2022-03-15 19:39:52 -07:00 • committed by GitHub
parent 1ec3636951
commit c64e3e3ba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Projects/UOContent/Engines/Pathing/Movement.cs
View file

@ -406,7 +406,15 @@ namespace Server.Movement
var notWater = !itemData.Wet;
if (!itemData.Surface && itemData.Impassable && (!canSwim || notWater) || cantWalk && notWater)
/*
* To move we must satisfy the following:
* 1. Item is a _passable_ surface and Mob can walk -or-
* 2. Item is water and Mob can swim
*/
if (
(!itemData.Surface || itemData.Impassable) && (!canSwim || notWater) ||
cantWalk && notWater
)
{
continue;
}
@ -477,7 +485,17 @@ namespace Server.Movement
var notWater = !itemData.Wet;
if (item.Movable || !itemData.Surface && itemData.Impassable && (!canSwim || notWater) || cantWalk && notWater)
/*
* To move we must satisfy the following:
* 1. Item is not movable
* 2. Item is a _passable_ surface and Mob can walk -or-
* Item is water and Mob can swim
*/
if (
item.Movable ||
(!itemData.Surface || itemData.Impassable) && (!canSwim || notWater) ||
cantWalk && notWater
)
{
continue;
}
@ -581,7 +599,7 @@ namespace Server.Movement
return moveIsOk;
}
private bool CanMoveOver(Mobile m, Mobile t) =>
private static bool CanMoveOver(Mobile m, Mobile t) =>
!t.Alive || !m.Alive || t.IsDeadBondedPet || m.IsDeadBondedPet || t.Hidden && t.AccessLevel > AccessLevel.Player;
private void GetStartZ(Mobile m, Map map, Point3D loc, List<Item> itemList, out int zLow, out int zTop)