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

Removal of CoordSynchronize configuration.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-03-28 14:47:27 +00:00
parent 7a11ed6ffe
commit b72bef5c61
138 changed files with 780 additions and 3031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_CT_2.6_HighFive/dist/game/config/GeoEngine.ini vendored
View File

@@ -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
# =================================================================

4
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java
View File

@@ -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);

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

@@ -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.");
}
if (Config.COORD_SYNCHRONIZE == 2)
{
Config.COORD_SYNCHRONIZE = -1;
LOGGER.info("GeoEngine: Forcing CoordSynchronize setting to -1.");
}
Config.PATHFINDING = false;
LOGGER.info("GeoEngine: Forcing PathFinding setting to false.");
}
}

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

@@ -3975,32 +3975,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
double dx;
double dy;
double dz;
if (Config.COORD_SYNCHRONIZE == 1)
// 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 (target != null)
{
if (target != null)
{
dx = target.getX() - xPrev;
dy = target.getY() - yPrev;
}
else
{
dx = m._xDestination - xPrev;
dy = m._yDestination - yPrev;
}
dx = target.getX() - m._xAccurate;
dy = target.getY() - m._yAccurate;
}
else // otherwise we need saved temporary values to avoid rounding errors
else
{
if (target != null)
{
dx = target.getX() - m._xAccurate;
dy = target.getY() - m._yAccurate;
}
else
{
dx = m._xDestination - m._xAccurate;
dy = m._yDestination - m._yAccurate;
}
dx = m._xDestination - m._xAccurate;
dy = m._yDestination - m._yAccurate;
}
// Z coordinate will follow client values

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

@@ -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(() ->

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

@@ -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);