Ignore no path found issues.
Thanks to Trance.
This commit is contained in:
@@ -2,16 +2,14 @@
|
||||
GEODATA COMPENDIUM
|
||||
##############################################
|
||||
|
||||
Comprehensive guide for geodata, by Tryskell and Hasha.
|
||||
Comprehensive guide for geodata.
|
||||
|
||||
I - How to configure it
|
||||
a - Prerequisites
|
||||
b - Make it work
|
||||
c - L2D format
|
||||
II - Addendum
|
||||
How to configure it
|
||||
a - Prerequisites
|
||||
b - Make it work
|
||||
|
||||
##############################################
|
||||
I - How to configure it
|
||||
How to configure it
|
||||
##############################################
|
||||
|
||||
----------------------------------------------
|
||||
@@ -30,12 +28,3 @@ To make geodata working:
|
||||
* open "/config/main/GeoEngine.ini" with your favorite text editor and then edit following config:
|
||||
- CoordSynchronize = 2
|
||||
* If you do not use any geodata files, the server will automatically change this setting to -1.
|
||||
|
||||
----------------------------------------------
|
||||
c - L2D format
|
||||
----------------------------------------------
|
||||
|
||||
* L2D is a new geodata file format. It holds diagonal movement informations, in addition to regular NSWE flags.
|
||||
* Heavier file weight (+30%), but the pathfinding algorithms are processed way faster (-35% calculation times).
|
||||
* L2D files can be converted from L2OFF/L2J formats without losing any information. Converter is part of the gameserver.
|
||||
* Keep in mind to convert new geodata files, once you update your L2OFF/L2J ones.
|
||||
|
@@ -177,6 +177,17 @@ public class GeoEngine
|
||||
return region.hasGeo();
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks the specified position for available geodata.
|
||||
* @param x the world x
|
||||
* @param y the world y
|
||||
* @return {@code true} if there is geodata for the given coordinates, {@code false} otherwise
|
||||
*/
|
||||
public boolean hasGeo(int x, int y)
|
||||
{
|
||||
return hasGeoPos(getGeoX(x), getGeoY(y));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param geoX
|
||||
* @param geoY
|
||||
@@ -271,6 +282,42 @@ public class GeoEngine
|
||||
return region.getNextHigherZ(geoX, geoY, worldZ);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the Z height.
|
||||
* @param x the world x
|
||||
* @param y the world y
|
||||
* @param z the world z
|
||||
* @return the nearest Z height
|
||||
*/
|
||||
public int getHeight(int x, int y, int z)
|
||||
{
|
||||
return getNearestZ(getGeoX(x), getGeoY(y), z);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the next lower Z height.
|
||||
* @param x the world x
|
||||
* @param y the world y
|
||||
* @param z the world z
|
||||
* @return the nearest Z height
|
||||
*/
|
||||
public int getLowerHeight(int x, int y, int z)
|
||||
{
|
||||
return getNextLowerZ(getGeoX(x), getGeoY(y), z);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the next higher Z height.
|
||||
* @param x the world x
|
||||
* @param y the world y
|
||||
* @param z the world z
|
||||
* @return the nearest Z height
|
||||
*/
|
||||
public int getHigherHeight(int x, int y, int z)
|
||||
{
|
||||
return getNextHigherZ(getGeoX(x), getGeoY(y), z);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param worldX
|
||||
* @return the geo X
|
||||
@@ -325,18 +372,6 @@ public class GeoEngine
|
||||
return (geoZ * 16) + WORLD_MIN_Z + 8;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the Z height.
|
||||
* @param x the x coordinate
|
||||
* @param y the y coordinate
|
||||
* @param z the z coordinate
|
||||
* @return the nearest Z height
|
||||
*/
|
||||
public int getHeight(int x, int y, int z)
|
||||
{
|
||||
return getNearestZ(getGeoX(x), getGeoY(y), z);
|
||||
}
|
||||
|
||||
/**
|
||||
* Can see target. Doors as target always return true. Checks doors between.
|
||||
* @param cha the character
|
||||
@@ -699,17 +734,6 @@ public class GeoEngine
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks the specified position for available geodata.
|
||||
* @param x the X coordinate
|
||||
* @param y the Y coordinate
|
||||
* @return {@code true} if there is geodata for the given coordinates, {@code false} otherwise
|
||||
*/
|
||||
public boolean hasGeo(int x, int y)
|
||||
{
|
||||
return hasGeoPos(getGeoX(x), getGeoY(y));
|
||||
}
|
||||
|
||||
public static GeoEngine getInstance()
|
||||
{
|
||||
return SingletonHolder.INSTANCE;
|
||||
|
@@ -5562,6 +5562,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
final Location destiny = GeoEngine.getInstance().canMoveToTargetLoc(curX, curY, curZ, x, y, z, getInstanceId());
|
||||
x = destiny.getX();
|
||||
y = destiny.getY();
|
||||
z = destiny.getZ();
|
||||
dx = x - curX;
|
||||
dy = y - curY;
|
||||
dz = z - curZ;
|
||||
@@ -5575,13 +5576,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
|
||||
m.geoPath = GeoEnginePathfinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceId());
|
||||
if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
|
||||
{
|
||||
if ((isPlayer()) || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((Summon) this).getFollowStatus()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m.disregardingGeodata = true;
|
||||
|
||||
// Mobius: Verify destination. Prevents wall collision issues.
|
||||
final Location newDestination = GeoEngine.getInstance().canMoveToTargetLoc(curX, curY, curZ, originalX, originalY, originalZ, getInstanceId());
|
||||
x = newDestination.getX();
|
||||
y = newDestination.getY();
|
||||
z = newDestination.getZ();
|
||||
x = originalX;
|
||||
y = originalY;
|
||||
z = originalZ;
|
||||
distance = originalDistance;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@@ -15849,7 +15849,7 @@ public class PlayerInstance extends Playable
|
||||
{
|
||||
if (Config.CORRECT_PLAYER_Z)
|
||||
{
|
||||
final int nearestZ = GeoEngine.getInstance().getNextLowerZ(getX(), getY(), getZ());
|
||||
final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
|
||||
if (getZ() < nearestZ)
|
||||
{
|
||||
teleToLocation(new Location(getX(), getY(), nearestZ), false);
|
||||
|
Reference in New Issue
Block a user