lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed canMoveToTarget unnecessary cell Y border intersection check.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-12-25 04:14:34 +00:00
parent f4e1599e0f
commit 9e7f8fbba7
25 changed files with 75 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -712,9 +712,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -723,8 +722,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -735,13 +734,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = Util.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -712,9 +712,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -723,8 +722,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -735,13 +734,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = Util.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -712,9 +712,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -723,8 +722,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -735,13 +734,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -712,9 +712,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -723,8 +722,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -735,13 +734,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }

13
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -713,9 +713,8 @@ public class GeoEngine
final double m = (double) dy / dx; final double m = (double) dy / dx;
final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy); final MoveDirectionType mdt = MoveDirectionType.getDirection(gtx - gox, gty - goy);
// Get cell grid coordinates. // Get cell grid X coordinate.
int gridX = ox & 0xFFFFFFF0; int gridX = ox & 0xFFFFFFF0;
int gridY = oy & 0xFFFFFFF0;
// Run loop. // Run loop.
byte dir; byte dir;
@@ -724,8 +723,8 @@ public class GeoEngine
while ((gox != gtx) || (goy != gty)) while ((gox != gtx) || (goy != gty))
{ {
// Calculate intersection with cell's X border. // Calculate intersection with cell's X border.
int checkX = gridX + mdt.getOffsetX(); final int checkX = gridX + mdt.getOffsetX();
int checkY = (int) (oy + (m * (checkX - ox))); final int checkY = (int) (oy + (m * (checkX - ox)));
if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy)) if ((mdt.getStepX() != 0) && (getGeoY(checkY) == goy))
{ {
@@ -736,13 +735,7 @@ public class GeoEngine
} }
else else
{ {
// Calculate intersection with cell's Y border.
checkY = gridY + mdt.getOffsetY();
checkX = (int) (ox + ((checkY - oy) / m));
checkX = CommonUtil.limit(checkX, gridX, gridX + 15);
// Set next cell in Y direction. // Set next cell in Y direction.
gridY += mdt.getStepY();
ny += mdt.getSignumY(); ny += mdt.getSignumY();
dir = mdt.getDirectionY(); dir = mdt.getDirectionY();
} }