Removal of CoordSynchronize configuration.

L2J_Mobius_1.0_Ertheia/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java

@@ -938,8 +938,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	/** Attribute System */
 	public static int S_WEAPON_STONE;
@@ -2477,8 +2475,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -110,18 +110,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3039,32 +3039,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -12699,14 +12699,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ));
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,26 +16,21 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
-/**
- * @version $Revision: 1.13.4.7 $ $Date: 2005/03/27 15:29:30 $
- */
 public class ValidatePosition implements IClientIncomingPacket
 {
 	private int _x;
 	private int _y;
 	private int _z;
 	private int _heading;
-	private int _data; // vehicle id
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
@@ -44,7 +39,7 @@ public class ValidatePosition implements IClientIncomingPacket
 		_y = packet.readD();
 		_z = packet.readD();
 		_heading = packet.readD();
-		_data = packet.readD();
+		packet.readD(); // vehicle id
 		return true;
 	}
 	
@@ -69,41 +64,14 @@ public class ValidatePosition implements IClientIncomingPacket
 		int dy;
 		int dz;
 		double diffSq;
-		if (player.isInBoat())
+		if (player.isInVehicle())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getInVehiclePosition().getX();
-				dy = _y - player.getInVehiclePosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					client.sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInVehiclePosition()));
-				}
-			}
-			return;
-		}
-		if (player.isInAirShip())
-		{
-			// Zoey76: TODO: Implement or cleanup.
-			// if (Config.COORD_SYNCHRONIZE == 2)
-			// {
-			// dx = _x - player.getInVehiclePosition().getX();
-			// dy = _y - player.getInVehiclePosition().getY();
-			// dz = _z - player.getInVehiclePosition().getZ();
-			// diffSq = ((dx * dx) + (dy * dy));
-			// if (diffSq > 250000)
-			// {
-			// sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
-			// }
-			// }
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -111,14 +79,6 @@ public class ValidatePosition implements IClientIncomingPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
-		
 		// Don't allow flying transformations outside gracia area!
 		if (player.isFlyingMounted() && (_x > World.GRACIA_MAX_X))
 		{
@@ -133,40 +93,8 @@ public class ValidatePosition implements IClientIncomingPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -176,15 +104,30 @@ public class ValidatePosition implements IClientIncomingPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_2.5_Underground/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java

@@ -948,8 +948,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	/** Attribute System */
 	public static int S_WEAPON_STONE;
@@ -2499,8 +2497,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -110,18 +110,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3039,32 +3039,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -12706,14 +12706,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ));
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,26 +16,21 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
-/**
- * @version $Revision: 1.13.4.7 $ $Date: 2005/03/27 15:29:30 $
- */
 public class ValidatePosition implements IClientIncomingPacket
 {
 	private int _x;
 	private int _y;
 	private int _z;
 	private int _heading;
-	private int _data; // vehicle id
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
@@ -44,7 +39,7 @@ public class ValidatePosition implements IClientIncomingPacket
 		_y = packet.readD();
 		_z = packet.readD();
 		_heading = packet.readD();
-		_data = packet.readD();
+		packet.readD(); // vehicle id
 		return true;
 	}
 	
@@ -69,41 +64,14 @@ public class ValidatePosition implements IClientIncomingPacket
 		int dy;
 		int dz;
 		double diffSq;
-		if (player.isInBoat())
+		if (player.isInVehicle())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getInVehiclePosition().getX();
-				dy = _y - player.getInVehiclePosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					client.sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInVehiclePosition()));
-				}
-			}
-			return;
-		}
-		if (player.isInAirShip())
-		{
-			// Zoey76: TODO: Implement or cleanup.
-			// if (Config.COORD_SYNCHRONIZE == 2)
-			// {
-			// dx = _x - player.getInVehiclePosition().getX();
-			// dy = _y - player.getInVehiclePosition().getY();
-			// dz = _z - player.getInVehiclePosition().getZ();
-			// diffSq = ((dx * dx) + (dy * dy));
-			// if (diffSq > 250000)
-			// {
-			// sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
-			// }
-			// }
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -111,14 +79,6 @@ public class ValidatePosition implements IClientIncomingPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
-		
 		// Don't allow flying transformations outside gracia area!
 		if (player.isFlyingMounted() && (_x > World.GRACIA_MAX_X))
 		{
@@ -133,40 +93,8 @@ public class ValidatePosition implements IClientIncomingPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -176,15 +104,30 @@ public class ValidatePosition implements IClientIncomingPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_3.0_Helios/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java

@@ -961,8 +961,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	/** Attribute System */
 	public static int S_WEAPON_STONE;
@@ -2521,8 +2519,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -110,18 +110,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3039,32 +3039,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -12708,14 +12708,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ));
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,26 +16,21 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
-/**
- * @version $Revision: 1.13.4.7 $ $Date: 2005/03/27 15:29:30 $
- */
 public class ValidatePosition implements IClientIncomingPacket
 {
 	private int _x;
 	private int _y;
 	private int _z;
 	private int _heading;
-	private int _data; // vehicle id
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
@@ -44,7 +39,7 @@ public class ValidatePosition implements IClientIncomingPacket
 		_y = packet.readD();
 		_z = packet.readD();
 		_heading = packet.readD();
-		_data = packet.readD();
+		packet.readD(); // vehicle id
 		return true;
 	}
 	
@@ -69,41 +64,14 @@ public class ValidatePosition implements IClientIncomingPacket
 		int dy;
 		int dz;
 		double diffSq;
-		if (player.isInBoat())
+		if (player.isInVehicle())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getInVehiclePosition().getX();
-				dy = _y - player.getInVehiclePosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					client.sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInVehiclePosition()));
-				}
-			}
-			return;
-		}
-		if (player.isInAirShip())
-		{
-			// Zoey76: TODO: Implement or cleanup.
-			// if (Config.COORD_SYNCHRONIZE == 2)
-			// {
-			// dx = _x - player.getInVehiclePosition().getX();
-			// dy = _y - player.getInVehiclePosition().getY();
-			// dz = _z - player.getInVehiclePosition().getZ();
-			// diffSq = ((dx * dx) + (dy * dy));
-			// if (diffSq > 250000)
-			// {
-			// sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
-			// }
-			// }
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -111,14 +79,6 @@ public class ValidatePosition implements IClientIncomingPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
-		
 		// Don't allow flying transformations outside gracia area!
 		if (player.isFlyingMounted() && (_x > World.GRACIA_MAX_X))
 		{
@@ -133,40 +93,8 @@ public class ValidatePosition implements IClientIncomingPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -176,15 +104,30 @@ public class ValidatePosition implements IClientIncomingPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_4.0_GrandCrusade/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java

@@ -948,8 +948,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	/** Attribute System */
 	public static int S_WEAPON_STONE;
@@ -2496,8 +2494,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -110,18 +110,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3039,32 +3039,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -12688,14 +12688,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ));
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,26 +16,21 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
-/**
- * @version $Revision: 1.13.4.7 $ $Date: 2005/03/27 15:29:30 $
- */
 public class ValidatePosition implements IClientIncomingPacket
 {
 	private int _x;
 	private int _y;
 	private int _z;
 	private int _heading;
-	private int _data; // vehicle id
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
@@ -44,7 +39,7 @@ public class ValidatePosition implements IClientIncomingPacket
 		_y = packet.readD();
 		_z = packet.readD();
 		_heading = packet.readD();
-		_data = packet.readD();
+		packet.readD(); // vehicle id
 		return true;
 	}
 	
@@ -69,41 +64,14 @@ public class ValidatePosition implements IClientIncomingPacket
 		int dy;
 		int dz;
 		double diffSq;
-		if (player.isInBoat())
+		if (player.isInVehicle())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getInVehiclePosition().getX();
-				dy = _y - player.getInVehiclePosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					client.sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInVehiclePosition()));
-				}
-			}
-			return;
-		}
-		if (player.isInAirShip())
-		{
-			// Zoey76: TODO: Implement or cleanup.
-			// if (Config.COORD_SYNCHRONIZE == 2)
-			// {
-			// dx = _x - player.getInVehiclePosition().getX();
-			// dy = _y - player.getInVehiclePosition().getY();
-			// dz = _z - player.getInVehiclePosition().getZ();
-			// diffSq = ((dx * dx) + (dy * dy));
-			// if (diffSq > 250000)
-			// {
-			// sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
-			// }
-			// }
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -111,14 +79,6 @@ public class ValidatePosition implements IClientIncomingPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
-		
 		// Don't allow flying transformations outside gracia area!
 		if (player.isFlyingMounted() && (_x > World.GRACIA_MAX_X))
 		{
@@ -133,40 +93,8 @@ public class ValidatePosition implements IClientIncomingPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -176,15 +104,30 @@ public class ValidatePosition implements IClientIncomingPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_5.0_Salvation/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java

@@ -943,8 +943,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	/** Attribute System */
 	public static int S_WEAPON_STONE;
@@ -2496,8 +2494,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -110,18 +110,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3039,32 +3039,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -12675,14 +12675,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ));
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,26 +16,21 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
-/**
- * @version $Revision: 1.13.4.7 $ $Date: 2005/03/27 15:29:30 $
- */
 public class ValidatePosition implements IClientIncomingPacket
 {
 	private int _x;
 	private int _y;
 	private int _z;
 	private int _heading;
-	private int _data; // vehicle id
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
@@ -44,7 +39,7 @@ public class ValidatePosition implements IClientIncomingPacket
 		_y = packet.readD();
 		_z = packet.readD();
 		_heading = packet.readD();
-		_data = packet.readD();
+		packet.readD(); // vehicle id
 		return true;
 	}
 	
@@ -69,41 +64,14 @@ public class ValidatePosition implements IClientIncomingPacket
 		int dy;
 		int dz;
 		double diffSq;
-		if (player.isInBoat())
+		if (player.isInVehicle())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getInVehiclePosition().getX();
-				dy = _y - player.getInVehiclePosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					client.sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInVehiclePosition()));
-				}
-			}
-			return;
-		}
-		if (player.isInAirShip())
-		{
-			// Zoey76: TODO: Implement or cleanup.
-			// if (Config.COORD_SYNCHRONIZE == 2)
-			// {
-			// dx = _x - player.getInVehiclePosition().getX();
-			// dy = _y - player.getInVehiclePosition().getY();
-			// dz = _z - player.getInVehiclePosition().getZ();
-			// diffSq = ((dx * dx) + (dy * dy));
-			// if (diffSq > 250000)
-			// {
-			// sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
-			// }
-			// }
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -111,14 +79,6 @@ public class ValidatePosition implements IClientIncomingPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
-		
 		// Don't allow flying transformations outside gracia area!
 		if (player.isFlyingMounted() && (_x > World.GRACIA_MAX_X))
 		{
@@ -133,40 +93,8 @@ public class ValidatePosition implements IClientIncomingPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -176,15 +104,30 @@ public class ValidatePosition implements IClientIncomingPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_5.5_EtinasFate/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java

@@ -950,8 +950,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	/** Attribute System */
 	public static int S_WEAPON_STONE;
@@ -2508,8 +2506,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -110,18 +110,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3039,32 +3039,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -12678,14 +12678,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ));
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,26 +16,21 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
-/**
- * @version $Revision: 1.13.4.7 $ $Date: 2005/03/27 15:29:30 $
- */
 public class ValidatePosition implements IClientIncomingPacket
 {
 	private int _x;
 	private int _y;
 	private int _z;
 	private int _heading;
-	private int _data; // vehicle id
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
@@ -44,7 +39,7 @@ public class ValidatePosition implements IClientIncomingPacket
 		_y = packet.readD();
 		_z = packet.readD();
 		_heading = packet.readD();
-		_data = packet.readD();
+		packet.readD(); // vehicle id
 		return true;
 	}
 	
@@ -69,41 +64,14 @@ public class ValidatePosition implements IClientIncomingPacket
 		int dy;
 		int dz;
 		double diffSq;
-		if (player.isInBoat())
+		if (player.isInVehicle())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getInVehiclePosition().getX();
-				dy = _y - player.getInVehiclePosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					client.sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInVehiclePosition()));
-				}
-			}
-			return;
-		}
-		if (player.isInAirShip())
-		{
-			// Zoey76: TODO: Implement or cleanup.
-			// if (Config.COORD_SYNCHRONIZE == 2)
-			// {
-			// dx = _x - player.getInVehiclePosition().getX();
-			// dy = _y - player.getInVehiclePosition().getY();
-			// dz = _z - player.getInVehiclePosition().getZ();
-			// diffSq = ((dx * dx) + (dy * dy));
-			// if (diffSq > 250000)
-			// {
-			// sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
-			// }
-			// }
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -111,14 +79,6 @@ public class ValidatePosition implements IClientIncomingPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
-		
 		// Don't allow flying transformations outside gracia area!
 		if (player.isFlyingMounted() && (_x > World.GRACIA_MAX_X))
 		{
@@ -133,40 +93,8 @@ public class ValidatePosition implements IClientIncomingPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -176,15 +104,30 @@ public class ValidatePosition implements IClientIncomingPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_6.0_Fafurion/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java

@@ -962,8 +962,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	/** Attribute System */
 	public static int S_WEAPON_STONE;
@@ -2551,8 +2549,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -110,18 +110,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3039,32 +3039,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -12684,14 +12684,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ));
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,26 +16,21 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
-/**
- * @version $Revision: 1.13.4.7 $ $Date: 2005/03/27 15:29:30 $
- */
 public class ValidatePosition implements IClientIncomingPacket
 {
 	private int _x;
 	private int _y;
 	private int _z;
 	private int _heading;
-	private int _data; // vehicle id
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
@@ -44,7 +39,7 @@ public class ValidatePosition implements IClientIncomingPacket
 		_y = packet.readD();
 		_z = packet.readD();
 		_heading = packet.readD();
-		_data = packet.readD();
+		packet.readD(); // vehicle id
 		return true;
 	}
 	
@@ -69,41 +64,14 @@ public class ValidatePosition implements IClientIncomingPacket
 		int dy;
 		int dz;
 		double diffSq;
-		if (player.isInBoat())
+		if (player.isInVehicle())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getInVehiclePosition().getX();
-				dy = _y - player.getInVehiclePosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					client.sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInVehiclePosition()));
-				}
-			}
-			return;
-		}
-		if (player.isInAirShip())
-		{
-			// Zoey76: TODO: Implement or cleanup.
-			// if (Config.COORD_SYNCHRONIZE == 2)
-			// {
-			// dx = _x - player.getInVehiclePosition().getX();
-			// dy = _y - player.getInVehiclePosition().getY();
-			// dz = _z - player.getInVehiclePosition().getZ();
-			// diffSq = ((dx * dx) + (dy * dy));
-			// if (diffSq > 250000)
-			// {
-			// sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
-			// }
-			// }
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -111,14 +79,6 @@ public class ValidatePosition implements IClientIncomingPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
-		
 		// Don't allow flying transformations outside gracia area!
 		if (player.isFlyingMounted() && (_x > World.GRACIA_MAX_X))
 		{
@@ -133,40 +93,8 @@ public class ValidatePosition implements IClientIncomingPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -176,15 +104,30 @@ public class ValidatePosition implements IClientIncomingPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_7.0_PreludeOfWar/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java

@@ -973,8 +973,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	/** Attribute System */
 	public static int S_WEAPON_STONE;
@@ -2575,8 +2573,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -110,18 +110,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3038,32 +3038,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -12692,14 +12692,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ));
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,26 +16,21 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
-/**
- * @version $Revision: 1.13.4.7 $ $Date: 2005/03/27 15:29:30 $
- */
 public class ValidatePosition implements IClientIncomingPacket
 {
 	private int _x;
 	private int _y;
 	private int _z;
 	private int _heading;
-	private int _data; // vehicle id
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
@@ -44,7 +39,7 @@ public class ValidatePosition implements IClientIncomingPacket
 		_y = packet.readD();
 		_z = packet.readD();
 		_heading = packet.readD();
-		_data = packet.readD();
+		packet.readD(); // vehicle id
 		return true;
 	}
 	
@@ -69,41 +64,14 @@ public class ValidatePosition implements IClientIncomingPacket
 		int dy;
 		int dz;
 		double diffSq;
-		if (player.isInBoat())
+		if (player.isInVehicle())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getInVehiclePosition().getX();
-				dy = _y - player.getInVehiclePosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					client.sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInVehiclePosition()));
-				}
-			}
-			return;
-		}
-		if (player.isInAirShip())
-		{
-			// Zoey76: TODO: Implement or cleanup.
-			// if (Config.COORD_SYNCHRONIZE == 2)
-			// {
-			// dx = _x - player.getInVehiclePosition().getX();
-			// dy = _y - player.getInVehiclePosition().getY();
-			// dz = _z - player.getInVehiclePosition().getZ();
-			// diffSq = ((dx * dx) + (dy * dy));
-			// if (diffSq > 250000)
-			// {
-			// sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
-			// }
-			// }
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -111,14 +79,6 @@ public class ValidatePosition implements IClientIncomingPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
-		
 		// Don't allow flying transformations outside gracia area!
 		if (player.isFlyingMounted() && (_x > World.GRACIA_MAX_X))
 		{
@@ -133,40 +93,8 @@ public class ValidatePosition implements IClientIncomingPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -176,15 +104,30 @@ public class ValidatePosition implements IClientIncomingPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_8.0_Homunculus/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/Config.java

@@ -973,8 +973,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	/** Attribute System */
 	public static int S_WEAPON_STONE;
@@ -2575,8 +2573,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -110,18 +110,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3038,32 +3038,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -12733,14 +12733,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ));
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,26 +16,21 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
-/**
- * @version $Revision: 1.13.4.7 $ $Date: 2005/03/27 15:29:30 $
- */
 public class ValidatePosition implements IClientIncomingPacket
 {
 	private int _x;
 	private int _y;
 	private int _z;
 	private int _heading;
-	private int _data; // vehicle id
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
@@ -44,7 +39,7 @@ public class ValidatePosition implements IClientIncomingPacket
 		_y = packet.readD();
 		_z = packet.readD();
 		_heading = packet.readD();
-		_data = packet.readD();
+		packet.readD(); // vehicle id
 		return true;
 	}
 	
@@ -69,41 +64,14 @@ public class ValidatePosition implements IClientIncomingPacket
 		int dy;
 		int dz;
 		double diffSq;
-		if (player.isInBoat())
+		if (player.isInVehicle())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getInVehiclePosition().getX();
-				dy = _y - player.getInVehiclePosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					client.sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInVehiclePosition()));
-				}
-			}
-			return;
-		}
-		if (player.isInAirShip())
-		{
-			// Zoey76: TODO: Implement or cleanup.
-			// if (Config.COORD_SYNCHRONIZE == 2)
-			// {
-			// dx = _x - player.getInVehiclePosition().getX();
-			// dy = _y - player.getInVehiclePosition().getY();
-			// dz = _z - player.getInVehiclePosition().getZ();
-			// diffSq = ((dx * dx) + (dy * dy));
-			// if (diffSq > 250000)
-			// {
-			// sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
-			// }
-			// }
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -111,14 +79,6 @@ public class ValidatePosition implements IClientIncomingPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
-		
 		// Don't allow flying transformations outside gracia area!
 		if (player.isFlyingMounted() && (_x > World.GRACIA_MAX_X))
 		{
@@ -133,40 +93,8 @@ public class ValidatePosition implements IClientIncomingPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -176,15 +104,30 @@ public class ValidatePosition implements IClientIncomingPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java

@@ -973,8 +973,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	/** Attribute System */
 	public static int S_WEAPON_STONE;
@@ -2575,8 +2573,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -110,18 +110,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3038,32 +3038,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -12733,14 +12733,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ));
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,26 +16,21 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
-/**
- * @version $Revision: 1.13.4.7 $ $Date: 2005/03/27 15:29:30 $
- */
 public class ValidatePosition implements IClientIncomingPacket
 {
 	private int _x;
 	private int _y;
 	private int _z;
 	private int _heading;
-	private int _data; // vehicle id
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
@@ -44,7 +39,7 @@ public class ValidatePosition implements IClientIncomingPacket
 		_y = packet.readD();
 		_z = packet.readD();
 		_heading = packet.readD();
-		_data = packet.readD();
+		packet.readD(); // vehicle id
 		return true;
 	}
 	
@@ -69,41 +64,14 @@ public class ValidatePosition implements IClientIncomingPacket
 		int dy;
 		int dz;
 		double diffSq;
-		if (player.isInBoat())
+		if (player.isInVehicle())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getInVehiclePosition().getX();
-				dy = _y - player.getInVehiclePosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					client.sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInVehiclePosition()));
-				}
-			}
-			return;
-		}
-		if (player.isInAirShip())
-		{
-			// Zoey76: TODO: Implement or cleanup.
-			// if (Config.COORD_SYNCHRONIZE == 2)
-			// {
-			// dx = _x - player.getInVehiclePosition().getX();
-			// dy = _y - player.getInVehiclePosition().getY();
-			// dz = _z - player.getInVehiclePosition().getZ();
-			// diffSq = ((dx * dx) + (dy * dy));
-			// if (diffSq > 250000)
-			// {
-			// sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
-			// }
-			// }
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -111,14 +79,6 @@ public class ValidatePosition implements IClientIncomingPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
-		
 		// Don't allow flying transformations outside gracia area!
 		if (player.isFlyingMounted() && (_x > World.GRACIA_MAX_X))
 		{
@@ -133,40 +93,8 @@ public class ValidatePosition implements IClientIncomingPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -176,15 +104,30 @@ public class ValidatePosition implements IClientIncomingPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java

@@ -937,8 +937,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	public static boolean FALL_DAMAGE;
 	public static boolean ALLOW_WATER;
 	
@@ -2502,8 +2500,6 @@ public class Config
 		MEDIUM_WEIGHT = geoengineConfig.getFloat("MediumWeight", 2);
 		HIGH_WEIGHT = geoengineConfig.getFloat("HighWeight", 3);
 		DIAGONAL_WEIGHT = geoengineConfig.getFloat("DiagonalWeight", 0.707f);
-		COORD_SYNCHRONIZE = geoengineConfig.getInt("CoordSynchronize", -1);
-		CORRECT_PLAYER_Z = geoengineConfig.getBoolean("CorrectPlayerZ", false);
 		FALL_DAMAGE = geoengineConfig.getBoolean("FallDamage", false);
 		ALLOW_WATER = geoengineConfig.getBoolean("AllowWater", false);
 	}

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -108,18 +108,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -5078,32 +5078,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 		double dy;
 		double dz;
 		double distFraction;
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		// Save temporary values to avoid rounding errors.
-		if (Config.COORD_SYNCHRONIZE == 1)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -12688,12 +12688,6 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean updatePosition(int gameTicks)
 	{
-		// Disables custom movement for PlayerInstance when Old Synchronization is selected
-		if (Config.COORD_SYNCHRONIZE == -1)
-		{
-			return super.updatePosition(gameTicks);
-		}
-		
 		// Get movement data
 		final MoveData m = _move;
 		if (_move == null)
@@ -15471,14 +15465,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ), false);
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,12 +16,11 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
-import org.l2jmobius.gameserver.network.serverpackets.ValidateLocationInVehicle;
 
 public class ValidatePosition extends GameClientPacket
 {
@@ -29,8 +28,6 @@ public class ValidatePosition extends GameClientPacket
 	private int _y;
 	private int _z;
 	private int _heading;
-	@SuppressWarnings("unused")
-	private int _data;
 	
 	@Override
 	protected void readImpl()
@@ -39,7 +36,7 @@ public class ValidatePosition extends GameClientPacket
 		_y = readD();
 		_z = readD();
 		_heading = readD();
-		_data = readD();
+		readD(); // vehicle id
 	}
 	
 	@Override
@@ -65,23 +62,12 @@ public class ValidatePosition extends GameClientPacket
 		double diffSq;
 		if (player.isInBoat())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getBoatPosition().getX();
-				dy = _y - player.getBoatPosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					sendPacket(new ValidateLocationInVehicle(player));
-				}
-			}
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -89,13 +75,6 @@ public class ValidatePosition extends GameClientPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
 		if (player.isFlying() || player.isInsideZone(ZoneId.WATER))
 		{
 			player.setXYZ(realX, realY, _z);
@@ -104,40 +83,8 @@ public class ValidatePosition extends GameClientPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -147,15 +94,30 @@ public class ValidatePosition extends GameClientPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_C6_Interlude/dist/game/config/main/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java

@@ -971,8 +971,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	public static boolean FALL_DAMAGE;
 	public static boolean ALLOW_WATER;
 	
@@ -2567,8 +2565,6 @@ public class Config
 		MEDIUM_WEIGHT = geoengineConfig.getFloat("MediumWeight", 2);
 		HIGH_WEIGHT = geoengineConfig.getFloat("HighWeight", 3);
 		DIAGONAL_WEIGHT = geoengineConfig.getFloat("DiagonalWeight", 0.707f);
-		COORD_SYNCHRONIZE = geoengineConfig.getInt("CoordSynchronize", -1);
-		CORRECT_PLAYER_Z = geoengineConfig.getBoolean("CorrectPlayerZ", false);
 		FALL_DAMAGE = geoengineConfig.getBoolean("FallDamage", false);
 		ALLOW_WATER = geoengineConfig.getBoolean("AllowWater", false);
 	}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -108,18 +108,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -5124,32 +5124,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 		double dy;
 		double dz;
 		double distFraction;
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		// Save temporary values to avoid rounding errors.
-		if (Config.COORD_SYNCHRONIZE == 1)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -12998,12 +12998,6 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean updatePosition(int gameTicks)
 	{
-		// Disables custom movement for PlayerInstance when Old Synchronization is selected
-		if (Config.COORD_SYNCHRONIZE == -1)
-		{
-			return super.updatePosition(gameTicks);
-		}
-		
 		// Get movement data
 		final MoveData m = _move;
 		if (_move == null)
@@ -15837,14 +15831,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ), false);
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,12 +16,11 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
-import org.l2jmobius.gameserver.network.serverpackets.ValidateLocationInVehicle;
 
 public class ValidatePosition extends GameClientPacket
 {
@@ -29,8 +28,6 @@ public class ValidatePosition extends GameClientPacket
 	private int _y;
 	private int _z;
 	private int _heading;
-	@SuppressWarnings("unused")
-	private int _data;
 	
 	@Override
 	protected void readImpl()
@@ -39,7 +36,7 @@ public class ValidatePosition extends GameClientPacket
 		_y = readD();
 		_z = readD();
 		_heading = readD();
-		_data = readD();
+		readD(); // vehicle id
 	}
 	
 	@Override
@@ -65,23 +62,12 @@ public class ValidatePosition extends GameClientPacket
 		double diffSq;
 		if (player.isInBoat())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getBoatPosition().getX();
-				dy = _y - player.getBoatPosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					sendPacket(new ValidateLocationInVehicle(player));
-				}
-			}
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -89,13 +75,6 @@ public class ValidatePosition extends GameClientPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
 		if (player.isFlying() || player.isInsideZone(ZoneId.WATER))
 		{
 			player.setXYZ(realX, realY, _z);
@@ -104,40 +83,8 @@ public class ValidatePosition extends GameClientPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -147,15 +94,30 @@ public class ValidatePosition extends GameClientPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_CT_2.4_Epilogue/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java

@@ -1066,8 +1066,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	// --------------------------------------------------
 	// Custom Settings
@@ -2593,8 +2591,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -109,18 +109,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3973,32 +3973,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -13500,14 +13500,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ));
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,26 +16,21 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
-/**
- * @version $Revision: 1.13.4.7 $ $Date: 2005/03/27 15:29:30 $
- */
 public class ValidatePosition implements IClientIncomingPacket
 {
 	private int _x;
 	private int _y;
 	private int _z;
 	private int _heading;
-	private int _data; // vehicle id
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
@@ -44,7 +39,7 @@ public class ValidatePosition implements IClientIncomingPacket
 		_y = packet.readD();
 		_z = packet.readD();
 		_heading = packet.readD();
-		_data = packet.readD();
+		packet.readD(); // vehicle id
 		return true;
 	}
 	
@@ -69,41 +64,14 @@ public class ValidatePosition implements IClientIncomingPacket
 		int dy;
 		int dz;
 		double diffSq;
-		if (player.isInBoat())
+		if (player.isInVehicle())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getInVehiclePosition().getX();
-				dy = _y - player.getInVehiclePosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					client.sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInVehiclePosition()));
-				}
-			}
-			return;
-		}
-		if (player.isInAirShip())
-		{
-			// Zoey76: TODO: Implement or cleanup.
-			// if (Config.COORD_SYNCHRONIZE == 2)
-			// {
-			// dx = _x - player.getInVehiclePosition().getX();
-			// dy = _y - player.getInVehiclePosition().getY();
-			// dz = _z - player.getInVehiclePosition().getZ();
-			// diffSq = ((dx * dx) + (dy * dy));
-			// if (diffSq > 250000)
-			// {
-			// sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
-			// }
-			// }
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -111,14 +79,6 @@ public class ValidatePosition implements IClientIncomingPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
-		
 		// Don't allow flying transformations outside gracia area!
 		if (player.isFlyingMounted() && (_x > World.GRACIA_MAX_X))
 		{
@@ -133,40 +93,8 @@ public class ValidatePosition implements IClientIncomingPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -176,15 +104,30 @@ public class ValidatePosition implements IClientIncomingPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_CT_2.6_HighFive/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java

@@ -1066,8 +1066,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	// --------------------------------------------------
 	// Custom Settings
@@ -2602,8 +2600,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -109,18 +109,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3975,32 +3975,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -13393,14 +13393,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ));
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,26 +16,21 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
-/**
- * @version $Revision: 1.13.4.7 $ $Date: 2005/03/27 15:29:30 $
- */
 public class ValidatePosition implements IClientIncomingPacket
 {
 	private int _x;
 	private int _y;
 	private int _z;
 	private int _heading;
-	private int _data; // vehicle id
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
@@ -44,7 +39,7 @@ public class ValidatePosition implements IClientIncomingPacket
 		_y = packet.readD();
 		_z = packet.readD();
 		_heading = packet.readD();
-		_data = packet.readD();
+		packet.readD(); // vehicle id
 		return true;
 	}
 	
@@ -69,41 +64,14 @@ public class ValidatePosition implements IClientIncomingPacket
 		int dy;
 		int dz;
 		double diffSq;
-		if (player.isInBoat())
+		if (player.isInVehicle())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getInVehiclePosition().getX();
-				dy = _y - player.getInVehiclePosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					client.sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInVehiclePosition()));
-				}
-			}
-			return;
-		}
-		if (player.isInAirShip())
-		{
-			// Zoey76: TODO: Implement or cleanup.
-			// if (Config.COORD_SYNCHRONIZE == 2)
-			// {
-			// dx = _x - player.getInVehiclePosition().getX();
-			// dy = _y - player.getInVehiclePosition().getY();
-			// dz = _z - player.getInVehiclePosition().getZ();
-			// diffSq = ((dx * dx) + (dy * dy));
-			// if (diffSq > 250000)
-			// {
-			// sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
-			// }
-			// }
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -111,14 +79,6 @@ public class ValidatePosition implements IClientIncomingPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
-		
 		// Don't allow flying transformations outside gracia area!
 		if (player.isFlyingMounted() && (_x > World.GRACIA_MAX_X))
 		{
@@ -133,40 +93,8 @@ public class ValidatePosition implements IClientIncomingPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -176,15 +104,30 @@ public class ValidatePosition implements IClientIncomingPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_Classic_2.0_Saviors/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java

@@ -895,8 +895,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	/** Attribute System */
 	public static int S_WEAPON_STONE;
@@ -2394,8 +2392,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -110,18 +110,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3039,32 +3039,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -12483,14 +12483,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ));
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,26 +16,21 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
-/**
- * @version $Revision: 1.13.4.7 $ $Date: 2005/03/27 15:29:30 $
- */
 public class ValidatePosition implements IClientIncomingPacket
 {
 	private int _x;
 	private int _y;
 	private int _z;
 	private int _heading;
-	private int _data; // vehicle id
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
@@ -44,7 +39,7 @@ public class ValidatePosition implements IClientIncomingPacket
 		_y = packet.readD();
 		_z = packet.readD();
 		_heading = packet.readD();
-		_data = packet.readD();
+		packet.readD(); // vehicle id
 		return true;
 	}
 	
@@ -69,41 +64,14 @@ public class ValidatePosition implements IClientIncomingPacket
 		int dy;
 		int dz;
 		double diffSq;
-		if (player.isInBoat())
+		if (player.isInVehicle())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getInVehiclePosition().getX();
-				dy = _y - player.getInVehiclePosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					client.sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInVehiclePosition()));
-				}
-			}
-			return;
-		}
-		if (player.isInAirShip())
-		{
-			// Zoey76: TODO: Implement or cleanup.
-			// if (Config.COORD_SYNCHRONIZE == 2)
-			// {
-			// dx = _x - player.getInVehiclePosition().getX();
-			// dy = _y - player.getInVehiclePosition().getY();
-			// dz = _z - player.getInVehiclePosition().getZ();
-			// diffSq = ((dx * dx) + (dy * dy));
-			// if (diffSq > 250000)
-			// {
-			// sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
-			// }
-			// }
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -111,14 +79,6 @@ public class ValidatePosition implements IClientIncomingPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
-		
 		// Don't allow flying transformations outside gracia area!
 		if (player.isFlyingMounted() && (_x > World.GRACIA_MAX_X))
 		{
@@ -133,40 +93,8 @@ public class ValidatePosition implements IClientIncomingPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -176,15 +104,30 @@ public class ValidatePosition implements IClientIncomingPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_Classic_2.1_Zaken/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java

@@ -899,8 +899,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	/** Attribute System */
 	public static int S_WEAPON_STONE;
@@ -2400,8 +2398,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -110,18 +110,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3039,32 +3039,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -12483,14 +12483,6 @@ public class PlayerInstance extends Playable
 		}
 		if (_fallingDamageTask != null)
 		{
-			if (Config.CORRECT_PLAYER_Z)
-			{
-				final int nearestZ = GeoEngine.getInstance().getHigherHeight(getX(), getY(), getZ());
-				if (getZ() < nearestZ)
-				{
-					teleToLocation(new Location(getX(), getY(), nearestZ));
-				}
-			}
 			_fallingDamageTask.cancel(true);
 		}
 		_fallingDamageTask = ThreadPool.schedule(() ->

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java

@@ -16,26 +16,21 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.data.xml.DoorData;
+import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
-import org.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
-/**
- * @version $Revision: 1.13.4.7 $ $Date: 2005/03/27 15:29:30 $
- */
 public class ValidatePosition implements IClientIncomingPacket
 {
 	private int _x;
 	private int _y;
 	private int _z;
 	private int _heading;
-	private int _data; // vehicle id
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
@@ -44,7 +39,7 @@ public class ValidatePosition implements IClientIncomingPacket
 		_y = packet.readD();
 		_z = packet.readD();
 		_heading = packet.readD();
-		_data = packet.readD();
+		packet.readD(); // vehicle id
 		return true;
 	}
 	
@@ -69,41 +64,14 @@ public class ValidatePosition implements IClientIncomingPacket
 		int dy;
 		int dz;
 		double diffSq;
-		if (player.isInBoat())
+		if (player.isInVehicle())
 		{
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				dx = _x - player.getInVehiclePosition().getX();
-				dy = _y - player.getInVehiclePosition().getY();
-				// dz = _z - player.getInVehiclePosition().getZ();
-				diffSq = ((dx * dx) + (dy * dy));
-				if (diffSq > 250000)
-				{
-					client.sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInVehiclePosition()));
-				}
-			}
-			return;
-		}
-		if (player.isInAirShip())
-		{
-			// Zoey76: TODO: Implement or cleanup.
-			// if (Config.COORD_SYNCHRONIZE == 2)
-			// {
-			// dx = _x - player.getInVehiclePosition().getX();
-			// dy = _y - player.getInVehiclePosition().getY();
-			// dz = _z - player.getInVehiclePosition().getZ();
-			// diffSq = ((dx * dx) + (dy * dy));
-			// if (diffSq > 250000)
-			// {
-			// sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
-			// }
-			// }
 			return;
 		}
 		
 		if (player.isFalling(_z))
 		{
-			return; // disable validations during fall to avoid "jumping"
+			return; // Disable validations during fall to avoid "jumping".
 		}
 		
 		dx = _x - realX;
@@ -111,14 +79,6 @@ public class ValidatePosition implements IClientIncomingPacket
 		dz = _z - realZ;
 		diffSq = ((dx * dx) + (dy * dy));
 		
-		// Zoey76: TODO: Implement or cleanup.
-		// Party party = player.getParty();
-		// if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
-		// {
-		// player.setLastPartyPosition(_x, _y, _z);
-		// party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
-		// }
-		
 		// Don't allow flying transformations outside gracia area!
 		if (player.isFlyingMounted() && (_x > World.GRACIA_MAX_X))
 		{
@@ -133,40 +93,8 @@ public class ValidatePosition implements IClientIncomingPacket
 				player.sendPacket(new ValidateLocation(player));
 			}
 		}
-		else if (diffSq < 360000) // if too large, messes observation
+		else if (diffSq < 360000) // If too large, messes observation.
 		{
-			if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
-			{
-				player.setXYZ(realX, realY, _z);
-				return;
-			}
-			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-			{
-				if (!player.isMoving() || !player.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-				{
-					// character is not moving, take coordinates from client
-					if (diffSq < 2500)
-					{
-						player.setXYZ(realX, realY, _z);
-					}
-					else
-					{
-						player.setXYZ(_x, _y, _z);
-					}
-				}
-				else
-				{
-					player.setXYZ(realX, realY, _z);
-				}
-				
-				player.setHeading(_heading);
-				return;
-			}
-			// Sync 2 (or other),
-			// intended for geodata. Sends a validation packet to client
-			// when too far from server calculated true coordinate.
-			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
-			// Important: this code part must work together with Creature.updatePosition
 			if ((diffSq > 250000) || (Math.abs(dz) > 200))
 			{
 				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
@@ -176,15 +104,30 @@ public class ValidatePosition implements IClientIncomingPacket
 				}
 				else
 				{
-					if (player.isFalling(_z))
-					{
-						player.setXYZ(realX, realY, _z);
-					}
 					player.sendPacket(new ValidateLocation(player));
 				}
 			}
 		}
 		
+		// Check out of sync.
+		if (player.calculateDistance3D(_x, _y, _z) > player.getStat().getMoveSpeed())
+		{
+			if (player.isFalling(_z))
+			{
+				final int nearestZ = GeoEngine.getInstance().getHigherHeight(_x, _y, _z);
+				if (player.getZ() < nearestZ)
+				{
+					player.setXYZ(_x, _y, nearestZ);
+					player.stopMove(null);
+				}
+			}
+			else
+			{
+				player.setXYZ(_x, _y, _z);
+			}
+			player.sendPacket(new ValidateLocation(player));
+		}
+		
 		player.setClientX(_x);
 		player.setClientY(_y);
 		player.setClientZ(_z);

L2J_Mobius_Classic_2.2_Antharas/dist/game/config/GeoEngine.ini

@@ -6,12 +6,6 @@
 # at different folder/harddrive ("C:/Program Files/Lineage II/system/geodata/"), default: ./data/geodata/
 GeoDataPath = ./data/geodata/
 
-# Player coordinates synchronization, default: 2
-#   1 - partial synchronization Client --> Server ; don't use it with geodata
-#   2 - partial synchronization Server --> Client ; use this setting with geodata
-#  -1 - Old system: will synchronize Z only
-CoordSynchronize = 2
-
 # =================================================================
 #                           Path finding
 # =================================================================

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java

@@ -899,8 +899,6 @@ public class Config
 	public static float MEDIUM_WEIGHT;
 	public static float HIGH_WEIGHT;
 	public static float DIAGONAL_WEIGHT;
-	public static int COORD_SYNCHRONIZE;
-	public static boolean CORRECT_PLAYER_Z;
 	
 	/** Attribute System */
 	public static int S_WEAPON_STONE;
@@ -2400,8 +2398,6 @@ public class Config
 			MEDIUM_WEIGHT = GeoEngine.getFloat("MediumWeight", 2);
 			HIGH_WEIGHT = GeoEngine.getFloat("HighWeight", 3);
 			DIAGONAL_WEIGHT = GeoEngine.getFloat("DiagonalWeight", 0.707f);
-			COORD_SYNCHRONIZE = GeoEngine.getInt("CoordSynchronize", -1);
-			CORRECT_PLAYER_Z = GeoEngine.getBoolean("CorrectPlayerZ", false);
 			
 			// Load AllowedPlayerRaces config file (if exists)
 			final PropertiesParser AllowedPlayerRaces = new PropertiesParser(CUSTOM_ALLOWED_PLAYER_RACES_CONFIG_FILE);

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java

@@ -110,18 +110,10 @@ public class GeoEngine
 		LOGGER.info("GeoEngine: Loaded " + loaded + " geodata files.");
 		
 		// Avoid wrong configs when no files are loaded.
-		if (loaded == 0)
+		if ((loaded == 0) && Config.PATHFINDING)
 		{
-			if (Config.PATHFINDING)
+			Config.PATHFINDING = false;
-			{
+			LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-				Config.PATHFINDING = false;
-				LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
-			}
-			if (Config.COORD_SYNCHRONIZE == 2)
-			{
-				Config.COORD_SYNCHRONIZE = -1;
-				LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
-			}
 		}
 	}
 	

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -3039,32 +3039,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		double dx;
 		double dy;
 		double dz;
-		if (Config.COORD_SYNCHRONIZE == 1)
+		// Save temporary values to avoid rounding errors.
-		// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+		if (target != null)
 		{
-			if (target != null)
+			dx = target.getX() - m._xAccurate;
-			{
+			dy = target.getY() - m._yAccurate;
-				dx = target.getX() - xPrev;
-				dy = target.getY() - yPrev;
-			}
-			else
-			{
-				dx = m._xDestination - xPrev;
-				dy = m._yDestination - yPrev;
-			}
 		}
-		else // otherwise we need saved temporary values to avoid rounding errors
+		else
 		{
-			if (target != null)
+			dx = m._xDestination - m._xAccurate;
-			{
+			dy = m._yDestination - m._yAccurate;
-				dx = target.getX() - m._xAccurate;
-				dy = target.getY() - m._yAccurate;
-			}
-			else
-			{
-				dx = m._xDestination - m._xAccurate;
-				dy = m._yDestination - m._yAccurate;
-			}
 		}
 		
 		// Z coordinate will follow client values