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

ValidatePosition related improvements.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-11-03 22:17:02 +00:00
parent 3ed4660df9
commit e225d8b13b
18 changed files with 196 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

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

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

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

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

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

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

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

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

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

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

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

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

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

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

17
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
View File

@@ -74,7 +74,7 @@ public class ValidatePosition extends GameClientPacket
{ {
dx = _x - player.getInBoatPosition().getX(); dx = _x - player.getInBoatPosition().getX();
dy = _y - player.getInBoatPosition().getY(); dy = _y - player.getInBoatPosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -95,11 +95,11 @@ public class ValidatePosition extends GameClientPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
if (player.isFlying() || player.isInsideZone(ZoneId.WATER)) if (player.isFlying() || player.isInsideZone(ZoneId.WATER))
@@ -112,8 +112,7 @@ public class ValidatePosition extends GameClientPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -147,8 +146,6 @@ public class ValidatePosition extends GameClientPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -156,6 +153,10 @@ public class ValidatePosition extends GameClientPacket
} }
else else
{ {
if (player.isFalling(_z))
{
player.setXYZ(realX, realY, _z);
}
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

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

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

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

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

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

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

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

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

32
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
View File

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

32
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
View File

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

32
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
View File

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

32
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
View File

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }

32
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
View File

@@ -61,12 +61,6 @@ public class ValidatePosition implements IClientIncomingPacket
final int realY = player.getY(); final int realY = player.getY();
int realZ = player.getZ(); int realZ = player.getZ();
if (Config.DEVELOPER)
{
LOGGER.finer("client pos: " + _x + " " + _y + " " + _z + " head " + _heading);
LOGGER.finer("server pos: " + realX + " " + realY + " " + realZ + " head " + player.getHeading());
}
if ((_x == 0) && (_y == 0)) if ((_x == 0) && (_y == 0))
{ {
if (realX != 0) if (realX != 0)
@@ -86,7 +80,7 @@ public class ValidatePosition implements IClientIncomingPacket
{ {
dx = _x - player.getInVehiclePosition().getX(); dx = _x - player.getInVehiclePosition().getX();
dy = _y - player.getInVehiclePosition().getY(); dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000) if (diffSq > 250000)
{ {
@@ -100,13 +94,13 @@ public class ValidatePosition implements IClientIncomingPacket
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// if (Config.COORD_SYNCHRONIZE == 2) // if (Config.COORD_SYNCHRONIZE == 2)
// { // {
// dx = _x - activeChar.getInVehiclePosition().getX(); // dx = _x - player.getInVehiclePosition().getX();
// dy = _y - activeChar.getInVehiclePosition().getY(); // dy = _y - player.getInVehiclePosition().getY();
// dz = _z - activeChar.getInVehiclePosition().getZ(); // dz = _z - player.getInVehiclePosition().getZ();
// diffSq = ((dx * dx) + (dy * dy)); // diffSq = ((dx * dx) + (dy * dy));
// if (diffSq > 250000) // if (diffSq > 250000)
// { // {
// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition())); // sendPacket(new GetOnVehicle(player.getObjectId(), _data, player.getInBoatPosition()));
// } // }
// } // }
return; return;
@@ -123,11 +117,11 @@ public class ValidatePosition implements IClientIncomingPacket
diffSq = ((dx * dx) + (dy * dy)); diffSq = ((dx * dx) + (dy * dy));
// Zoey76: TODO: Implement or cleanup. // Zoey76: TODO: Implement or cleanup.
// Party party = activeChar.getParty(); // Party party = player.getParty();
// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)) // if ((party != null) && (player.getLastPartyPositionDistance(_x, _y, _z) > 150))
// { // {
// player.setLastPartyPosition(_x, _y, _z); // player.setLastPartyPosition(_x, _y, _z);
// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar)); // party.broadcastToPartyMembers(player, new PartyMemberPosition(player));
// } // }
// Don't allow flying transformations outside gracia area! // Don't allow flying transformations outside gracia area!
@@ -146,8 +140,7 @@ public class ValidatePosition implements IClientIncomingPacket
} }
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, if (Config.COORD_SYNCHRONIZE == -1) // Only Z coordinate synched to server, mainly used when no geodata but can be used also with geodata
// mainly used when no geodata but can be used also with geodata
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
return; return;
@@ -181,8 +174,6 @@ public class ValidatePosition implements IClientIncomingPacket
// Important: this code part must work together with Creature.updatePosition // Important: this code part must work together with Creature.updatePosition
if ((diffSq > 250000) || (Math.abs(dz) > 200)) if ((diffSq > 250000) || (Math.abs(dz) > 200))
{ {
// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800)) if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - player.getClientZ()) < 800))
{ {
player.setXYZ(realX, realY, _z); player.setXYZ(realX, realY, _z);
@@ -190,11 +181,10 @@ public class ValidatePosition implements IClientIncomingPacket
} }
else else
{ {
if (Config.DEVELOPER) if (player.isFalling(_z))
{ {
LOGGER.info(player.getName() + ": Synchronizing position Server --> Client"); player.setXYZ(realX, realY, _z);
} }
player.sendPacket(new ValidateLocation(player)); player.sendPacket(new ValidateLocation(player));
} }
} }