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

fix(network): Adds UOG & Fixes ConnectUO packet (#552)

Browse source 
- [X] Adds UOG Extended and Compact (0xF1 0x51 packet)
- [X] Fixes ConnectUO bad length
This commit is contained in:
Kamron Batman 2021-03-15 16:18:28 -07:00 • committed by GitHub
parent 5e3b42bf9c
commit c50322c0e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 196 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Engines/Harvest/Mining.cs
View file

@ -414,7 +414,7 @@ namespace Server.Engines.Harvest
var z = map.GetAverageZ(x, y);
if (Math.Abs(z - from.Z) < 10 && map.CanSpawnMobile(x, y, z))
if ((z - from.Z).Abs() < 10 && map.CanSpawnMobile(x, y, z))
{
spawned.OnBeforeSpawn(new Point3D(x, y, z), map);
spawned.MoveToWorld(new Point3D(x, y, z), map);

6
Projects/UOContent/Engines/Pathing/FastMovement.cs
View file

@ -297,7 +297,7 @@ namespace Server.Movement
if (moveIsOk)
{
var cmp = Math.Abs(ourZ - m.Z) - Math.Abs(newZ - m.Z);
var cmp = (ourZ - m.Z).Abs() - (newZ - m.Z).Abs();
if (cmp > 0 || cmp == 0 && ourZ > newZ)
{
@ -379,7 +379,7 @@ namespace Server.Movement
if (moveIsOk)
{
var cmp = Math.Abs(ourZ - m.Z) - Math.Abs(newZ - m.Z);
var cmp = (ourZ - m.Z).Abs() - (newZ - m.Z).Abs();
if (cmp > 0 || cmp == 0 && ourZ > newZ)
{
@ -445,7 +445,7 @@ namespace Server.Movement
if (moveIsOk)
{
var cmp = Math.Abs(ourZ - m.Z) - Math.Abs(newZ - m.Z);
var cmp = (ourZ - m.Z).Abs() - (newZ - m.Z).Abs();
if (cmp > 0 || cmp == 0 && ourZ > newZ)
{

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

@ -464,7 +464,7 @@ namespace Server.Movement
if (moveIsOk)
{
var cmp = Math.Abs(ourZ - m.Z) - Math.Abs(newZ - m.Z);
var cmp = (ourZ - m.Z).Abs() - (newZ - m.Z).Abs();
if (cmp > 0 || cmp == 0 && ourZ > newZ)
{
@ -532,7 +532,7 @@ namespace Server.Movement
if (moveIsOk)
{
var cmp = Math.Abs(ourZ - m.Z) - Math.Abs(newZ - m.Z);
var cmp = (ourZ - m.Z).Abs() - (newZ - m.Z).Abs();
if (cmp > 0 || cmp == 0 && ourZ > newZ)
{
@ -591,7 +591,7 @@ namespace Server.Movement
if (moveIsOk)
{
var cmp = Math.Abs(ourZ - m.Z) - Math.Abs(newZ - m.Z);
var cmp = (ourZ - m.Z).Abs() - (newZ - m.Z).Abs();
if (cmp > 0 || cmp == 0 && ourZ > newZ)
{

2
Projects/UOContent/Engines/Pathing/PathFollower.cs
View file

@ -86,7 +86,7 @@ namespace Server
}
public static bool Check(Point3D loc, Point3D goal, int range) =>
Utility.InRange(loc, goal, range) && (range > 1 || Math.Abs(loc.Z - goal.Z) < 16);
Utility.InRange(loc, goal, range) && (range > 1 || (loc.Z - goal.Z).Abs() < 16);
public bool Follow(bool run, int range)
{

2
Projects/UOContent/Engines/Pathing/SlowAStarAlgorithm.cs
View file

@ -86,7 +86,7 @@ namespace Server.PathAlgorithms.SlowAStar
}
}
if (curNode.x == goalNode.x && curNode.y == goalNode.y && Math.Abs(curNode.z - goalNode.z) < 16)
if (curNode.x == goalNode.x && curNode.y == goalNode.y && (curNode.z - goalNode.z).Abs() < 16)
{
if (closedCount == MaxNodes)
{

2
Projects/UOContent/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs
View file

@ -265,7 +265,7 @@ namespace Server.Mobiles
{
var range = 3;
if (pm.Alive && Math.Abs(Z - pm.Z) < 16 && InRange(m, range) && !InRange(oldLocation, range))
if (pm.Alive && (Z - pm.Z).Abs() < 16 && InRange(m, range) && !InRange(oldLocation, range))
{
if (pm.ToTItemsTurnedIn >= TreasuresOfTokuno.ItemsPerReward)
{