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

Updated L2D geoengine patch.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-03-15 00:02:02 +00:00
parent 11a8af106c
commit d647af4b19
19 changed files with 2204 additions and 2527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

249
L2J_Mobius_1.0_Ertheia/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_2.5_Underground/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_3.0_Helios/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_4.0_GrandCrusade/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_5.0_Salvation/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_5.5_EtinasFate/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_6.0_Fafurion/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_8.0_Homunculus/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_Classic_Interlude/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;

249
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/geodata/L2D_GeoEngine.patch vendored
View File

@@ -14,78 +14,78 @@ Index: dist/game/GeoDataConverter.sh
--- dist/game/GeoDataConverter.sh (nonexistent) --- dist/game/GeoDataConverter.sh (nonexistent)
+++ dist/game/GeoDataConverter.sh (working copy) +++ dist/game/GeoDataConverter.sh (working copy)
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+#! /bin/sh +#! /bin/sh
+ +
+java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1 +java -Xmx512m -cp ../libs/*: org.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+ +
Index: dist/game/config/GeoEngine.ini Index: dist/game/config/GeoEngine.ini
=================================================================== ===================================================================
--- dist/game/config/GeoEngine.ini (revision 8397) --- dist/game/config/GeoEngine.ini (revision 8409)
+++ dist/game/config/GeoEngine.ini (working copy) +++ dist/game/config/GeoEngine.ini (working copy)
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
# ================================================================= # =================================================================
# Geodata # Geodata
# ================================================================= # =================================================================
+# Because of real-time performance we are using geodata files only in +# Because of real-time performance we are using geodata files only in
+# diagonal L2D format now (using filename e.g. 22_16.l2d). +# diagonal L2D format now (using filename e.g. 22_16.l2d).
+# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata. +# L2D geodata can be obtained by conversion of existing L2J or L2OFF geodata.
+# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion. +# Launch "GeoDataConverter.bat/sh" and follow instructions to start the conversion.
# Specifies the path to geodata files. For example, when using geodata files located # Specifies the path to geodata files. For example, when using geodata files located
# at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/ # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
@@ -13,6 +17,16 @@ @@ -13,6 +17,16 @@
CoordSynchronize = 2 CoordSynchronize = 2
# ================================================================= # =================================================================
+# Path checking +# Path checking
+# ================================================================= +# =================================================================
+ +
+# Line of sight start at X percent of the character height, default: 75 +# Line of sight start at X percent of the character height, default: 75
+PartOfCharacterHeight = 75 +PartOfCharacterHeight = 75
+ +
+# Maximum height of an obstacle, which can exceed the line of sight, default: 32 +# Maximum height of an obstacle, which can exceed the line of sight, default: 32
+MaxObstacleHeight = 32 +MaxObstacleHeight = 32
+ +
+# ================================================================= +# =================================================================
# Path finding # Path finding
# ================================================================= # =================================================================
@@ -23,19 +37,23 @@ @@ -23,19 +37,23 @@
# Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2 # Pathfinding array buffers configuration, default: 100x6;128x6;192x6;256x4;320x4;384x4;500x2
PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
-# Weight for nodes without obstacles far from walls -# Weight for nodes without obstacles far from walls
-LowWeight = 0.5 -LowWeight = 0.5
+# Base path weight, when moving from one node to another on axis direction, default: 10 +# Base path weight, when moving from one node to another on axis direction, default: 10
+BaseWeight = 10 +BaseWeight = 10
-# Weight for nodes near walls -# Weight for nodes near walls
-MediumWeight = 2 -MediumWeight = 2
+# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14 +# Path weight, when moving from one node to another on diagonal direction, default: BaseWeight * sqrt(2) = 14
+DiagonalWeight = 14 +DiagonalWeight = 14
-# Weight for nodes with obstacles -# Weight for nodes with obstacles
-HighWeight = 3 -HighWeight = 3
+# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier. +# When movement flags of target node is blocked to any direction, multiply movement weight by this multiplier.
+# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10 +# This causes pathfinding algorithm to avoid path construction exactly near an obstacle, default: 10
+ObstacleMultiplier = 10 +ObstacleMultiplier = 10
-# Weight for diagonal movement. -# Weight for diagonal movement.
-# Default: LowWeight * sqrt(2) -# Default: LowWeight * sqrt(2)
-DiagonalWeight = 0.707 -DiagonalWeight = 0.707
+# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20 +# Weight of the heuristic algorithm, which is giving estimated cost from node to target, default: 20
+# For proper function must be higher than BaseWeight and/or DiagonalWeight. +# For proper function must be higher than BaseWeight and/or DiagonalWeight.
+HeuristicWeight = 20 +HeuristicWeight = 20
+# Maximum number of generated nodes per one path-finding process, default 3500 +# Maximum number of generated nodes per one path-finding process, default 3500
+MaxIterations = 3500 +MaxIterations = 3500
+ +
# ================================================================= # =================================================================
# Other # Other
# ================================================================= # =================================================================
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java (working copy)
@@ -55,9 +55,8 @@ @@ -55,9 +55,8 @@
final int worldX = activeChar.getX(); final int worldX = activeChar.getX();
@@ -113,7 +113,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ)); BuilderUtil.sendSysMessage(activeChar, "WorldX: " + worldX + ", WorldY: " + worldY + ", WorldZ: " + worldZ + ", GeoX: " + geoX + ", GeoY: " + geoY + ", GeoZ: " + GeoEngine.getInstance().getHeight(worldX, worldY, worldZ));
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
=================================================================== ===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8397) --- dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (revision 8409)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy) +++ dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java (working copy)
@@ -18,11 +18,11 @@ @@ -18,11 +18,11 @@
@@ -174,7 +174,7 @@ Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Index: java/org/l2jmobius/Config.java Index: java/org/l2jmobius/Config.java
=================================================================== ===================================================================
--- java/org/l2jmobius/Config.java (revision 8397) --- java/org/l2jmobius/Config.java (revision 8409)
+++ java/org/l2jmobius/Config.java (working copy) +++ java/org/l2jmobius/Config.java (working copy)
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -184,7 +184,7 @@ Index: java/org/l2jmobius/Config.java
import java.nio.file.Paths; import java.nio.file.Paths;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@@ -927,14 +926,17 @@ @@ -966,14 +965,17 @@
// -------------------------------------------------- // --------------------------------------------------
// GeoEngine // GeoEngine
// -------------------------------------------------- // --------------------------------------------------
@@ -208,7 +208,7 @@ Index: java/org/l2jmobius/Config.java
public static boolean CORRECT_PLAYER_Z; public static boolean CORRECT_PLAYER_Z;
/** Attribute System */ /** Attribute System */
@@ -2468,14 +2470,17 @@ @@ -2568,14 +2570,17 @@
// Load GeoEngine config file (if exists) // Load GeoEngine config file (if exists)
final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE); final PropertiesParser GeoEngine = new PropertiesParser(GEOENGINE_CONFIG_FILE);
@@ -234,9 +234,9 @@ Index: java/org/l2jmobius/Config.java
// Load AllowedPlayerRaces config file (if exists) // Load AllowedPlayerRaces config file (if exists)
Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (revision 8435)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEngine.java (working copy)
@@ -16,101 +16,91 @@ @@ -16,100 +16,90 @@
*/ */
package org.l2jmobius.gameserver.geoengine; package org.l2jmobius.gameserver.geoengine;
@@ -269,7 +269,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat; +import org.l2jmobius.gameserver.geoengine.geodata.GeoFormat;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation; +import org.l2jmobius.gameserver.geoengine.geodata.GeoLocation;
+import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure; +import org.l2jmobius.gameserver.geoengine.geodata.GeoStructure;
import org.l2jmobius.gameserver.instancemanager.WarpedSpaceManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldObject;
@@ -389,7 +388,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
if (loaded == 0) if (loaded == 0)
{ {
if (Config.PATHFINDING) if (Config.PATHFINDING)
@@ -124,627 +114,832 @@ @@ -123,619 +113,820 @@
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1."); LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
} }
} }
@@ -901,10 +900,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- throw new RuntimeException("Multiple directions!"); - throw new RuntimeException("Multiple directions!");
+ return false; + return false;
} }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) - if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe))
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
@@ -993,10 +988,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ return false; + return false;
+ } + }
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
+ {
+ return false;
+ }
- int z = getNearestZ(geoX, geoY, zValue); - int z = getNearestZ(geoX, geoY, zValue);
- int tz = getNearestZ(tGeoX, tGeoY, tzValue); - int tz = getNearestZ(tGeoX, tGeoY, tzValue);
@@ -1363,8 +1354,13 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
- return new Location(x, y, getHeight(x, y, z)); - return new Location(x, y, getHeight(x, y, z));
+ return true; + return true;
} }
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(x, y, z, tx, ty, tz, instance))
+ - final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // perform geodata check + // perform geodata check
+ final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance); + final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instance);
+ return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty); + return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
@@ -1385,36 +1381,19 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ { + {
+ // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement. + // Mobius: Double check for doors before normal checkMove to avoid exploiting key movement.
+ if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false)) + if (DoorData.getInstance().checkIfDoorsBetween(ox, oy, oz, tx, ty, tz, instance, false))
{ + {
- return new Location(x, y, getHeight(x, y, z));
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
} + }
+ if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(ox, oy, oz, tx, ty, tz, instance))
+ { + {
+ return new Location(ox, oy, oz); + return new Location(ox, oy, oz);
+ } + }
- final LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY); - while (pointIter.next())
- // First point is guaranteed to be available.
- pointIter.next();
- int prevX = pointIter.x();
- int prevY = pointIter.y();
- int prevZ = z;
+ // get origin and check existing geo coordinates + // get origin and check existing geo coordinates
+ final int gox = getGeoX(ox); + final int gox = getGeoX(ox);
+ final int goy = getGeoY(oy); + final int goy = getGeoY(oy);
+ if (!hasGeoPos(gox, goy)) + if (!hasGeoPos(gox, goy))
+ {
+ return new Location(tx, ty, tz);
+ }
- while (pointIter.next())
+ final short goz = getHeightNearest(gox, goy, oz);
+
+ // get target and check existing geo coordinates
+ final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- final int curX = pointIter.x(); - final int curX = pointIter.x();
- final int curY = pointIter.y(); - final int curY = pointIter.y();
@@ -1437,10 +1416,12 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- if (hasGeoPos(prevX, prevY) && (prevZ != tz)) - if (hasGeoPos(prevX, prevY) && (prevZ != tz))
+ final short gtz = getHeightNearest(gtx, gty, tz); + final short goz = getHeightNearest(gox, goy, oz);
+ +
+ // target coordinates reached + // get target and check existing geo coordinates
+ if ((gox == gtx) && (goy == gty) && (goz == gtz)) + final int gtx = getGeoX(tx);
+ final int gty = getGeoY(ty);
+ if (!hasGeoPos(gtx, gty))
{ {
- // Different floors, return start location. - // Different floors, return start location.
- return new Location(x, y, z); - return new Location(x, y, z);
@@ -1448,6 +1429,14 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
} }
- return new Location(tx, ty, tz); - return new Location(tx, ty, tz);
+ final short gtz = getHeightNearest(gtx, gty, tz);
+
+ // target coordinates reached
+ if ((gox == gtx) && (goy == gty) && (goz == gtz))
+ {
+ return new Location(tx, ty, tz);
+ }
+
+ // perform geodata check + // perform geodata check
+ return checkMove(gox, goy, goz, gtx, gty, gtz, instance); + return checkMove(gox, goy, goz, gtx, gty, gtz, instance);
} }
@@ -1504,12 +1493,6 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+ if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance)) + if (FenceData.getInstance().checkIfFenceBetween(gox, goy, goz, gtx, gty, gtz, instance))
{ {
- return false; - return false;
+ return new GeoLocation(gox, goy, goz);
}
- if (WarpedSpaceManager.getInstance().checkForWarpedSpace(fromX, fromY, fromZ, toX, toY, toZ, instance))
+ if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
- return false;
+ return new GeoLocation(gox, goy, goz); + return new GeoLocation(gox, goy, goz);
} }
@@ -1669,7 +1652,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
public static GeoEngine getInstance() public static GeoEngine getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
@@ -752,6 +947,6 @@ @@ -743,6 +934,6 @@
private static class SingletonHolder private static class SingletonHolder
{ {
@@ -1681,7 +1664,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java Index: java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy) +++ java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java (working copy)
@@ -20,88 +20,84 @@ @@ -20,88 +20,84 @@
import java.util.LinkedList; import java.util.LinkedList;
@@ -3370,7 +3353,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/BlockNull.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java (nonexistent)
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-/* -/*
@@ -3423,7 +3406,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Cell.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java (nonexistent)
@@ -1,77 +0,0 @@ @@ -1,77 +0,0 @@
-/* -/*
@@ -3505,7 +3488,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/ComplexBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/FlatBlock.java (nonexistent)
@@ -1,56 +0,0 @@ @@ -1,56 +0,0 @@
-/* -/*
@@ -3760,7 +3743,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/GeoStructure.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IBlock.java (nonexistent)
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
-/* -/*
@@ -3865,7 +3848,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IGeoObject.java
+} +}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java (nonexistent)
@@ -1,47 +0,0 @@ @@ -1,47 +0,0 @@
-/* -/*
@@ -3917,7 +3900,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/IRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -4105,7 +4088,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/MultilayerBlock.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java (nonexistent)
@@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
-/* -/*
@@ -4165,7 +4148,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/NullRegion.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/geodata/Region.java (nonexistent)
@@ -1,92 +0,0 @@ @@ -1,92 +0,0 @@
-/* -/*
@@ -4262,7 +4245,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/geodata/Region.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java (nonexistent)
@@ -1,87 +0,0 @@ @@ -1,87 +0,0 @@
-/* -/*
@@ -4355,7 +4338,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java (nonexistent)
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
-/* -/*
@@ -4393,7 +4376,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/AbstractNodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java (nonexistent)
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
-/* -/*
@@ -4466,7 +4449,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNode.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/CellNodeBuffer.java (nonexistent)
@@ -1,348 +0,0 @@ @@ -1,348 +0,0 @@
-/* -/*
@@ -5225,7 +5208,7 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
\ No newline at end of file \ No newline at end of file
Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8397) --- java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (revision 8409)
+++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent) +++ java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java (nonexistent)
@@ -1,183 +0,0 @@ @@ -1,183 +0,0 @@
-/* -/*
@@ -5413,9 +5396,9 @@ Index: java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeLoc.java
-} -}
Index: java/org/l2jmobius/gameserver/model/actor/Creature.java Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8399) --- java/org/l2jmobius/gameserver/model/actor/Creature.java (revision 8428)
+++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/Creature.java (working copy)
@@ -66,8 +66,6 @@ @@ -65,8 +65,6 @@
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.enums.UserInfoType;
import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -5424,7 +5407,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.IdManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.QuestManager;
@@ -2577,7 +2575,7 @@ @@ -2566,7 +2564,7 @@
public boolean disregardingGeodata; public boolean disregardingGeodata;
public int onGeodataPathIndex; public int onGeodataPathIndex;
@@ -5433,7 +5416,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
public int geoPathAccurateTx; public int geoPathAccurateTx;
public int geoPathAccurateTy; public int geoPathAccurateTy;
public int geoPathGtx; public int geoPathGtx;
@@ -3466,7 +3464,7 @@ @@ -3443,7 +3441,7 @@
if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle) if (((originalDistance - distance) > 30) && !isControlBlocked() && !isInVehicle)
{ {
// Path calculation -- overrides previous movement check // Path calculation -- overrides previous movement check
@@ -5444,9 +5427,9 @@ Index: java/org/l2jmobius/gameserver/model/actor/Creature.java
if (isPlayer() && !_isFlying && !isInWater) if (isPlayer() && !_isFlying && !isInWater)
Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8397) --- java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (revision 8424)
+++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy) +++ java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java (working copy)
@@ -12704,7 +12704,7 @@ @@ -12746,7 +12746,7 @@
{ {
if (Config.CORRECT_PLAYER_Z) if (Config.CORRECT_PLAYER_Z)
{ {
@@ -5457,7 +5440,7 @@ Index: java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
teleToLocation(new Location(getX(), getY(), nearestZ)); teleToLocation(new Location(getX(), getY(), nearestZ));
Index: java/org/l2jmobius/gameserver/util/GeoUtils.java Index: java/org/l2jmobius/gameserver/util/GeoUtils.java
=================================================================== ===================================================================
--- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8397) --- java/org/l2jmobius/gameserver/util/GeoUtils.java (revision 8409)
+++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy) +++ java/org/l2jmobius/gameserver/util/GeoUtils.java (working copy)
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
import java.awt.Color; import java.awt.Color;