Attempt to fix critical errors with CoordSynchronize = 2

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/ValidatePosition.java

@@ -34,166 +34,153 @@ import com.l2jserver.gameserver.network.serverpackets.ValidateLocationInVehicle;
  */
 public class ValidatePosition extends L2GameClientPacket
 {
-    private static Logger _log = Logger.getLogger(ValidatePosition.class.getName());
-    private static final String _C__48_VALIDATEPOSITION = "[C] 48 ValidatePosition";
+	private static Logger _log = Logger.getLogger(ValidatePosition.class.getName());
+	private static final String _C__48_VALIDATEPOSITION = "[C] 48 ValidatePosition";
 
-    /** urgent messages, execute immediately */
-    public TaskPriority getPriority() { return TaskPriority.PR_HIGH; }
+	/** urgent messages, execute immediately */
+	public TaskPriority getPriority() { return TaskPriority.PR_HIGH; }
 
-    private int _x;
-    private int _y;
-    private int _z;
-    private int _heading;
-    @SuppressWarnings("unused")
-    private int _data;
+	private int _x;
+	private int _y;
+	private int _z;
+	private int _heading;
+	@SuppressWarnings("unused")
+	private int _data;
 
-
-    @Override
+	@Override
 	protected void readImpl()
-    {
-        _x  = readD();
-        _y  = readD();
-        _z  = readD();
-        _heading  = readD();
-        _data  = readD();
-    }
-
-    @Override
+	{
+		_x  = readD();
+		_y  = readD();
+		_z  = readD();
+		_heading  = readD();
+		_data  = readD();
+	}
+
+	@Override
 	protected void runImpl()
-    {
-    	L2PcInstance activeChar = getClient().getActiveChar();
-        if (activeChar == null || activeChar.isTeleporting()) return;
-
-        int realX = activeChar.getX();
-        int realY = activeChar.getY();
-        int realZ = activeChar.getZ();
-
-        if (_x == 0 && _y == 0) 
-        {
-        	if (realX != 0) // in this case this seems like a client error
-        		return;
-        }
-        
-        if(activeChar.getParty() != null && activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)
-        {
-            activeChar.setLastPartyPosition(_x, _y, _z);
-        	activeChar.getParty().broadcastToPartyMembers(activeChar,new PartyMemberPosition(activeChar));
-        }
-        
-        double dx = _x - realX;
-        double dy = _y - realY;
-        double dz = _z - realZ;
-        double diffSq = (dx*dx + dy*dy);
-        
-        if (Config.DEVELOPER) {
-            _log.fine("client pos: "+ _x + " "+ _y + " "+ _z +" head "+ _heading);
-            _log.fine("server pos: "+ realX + " "+realY+ " "+realZ +" head "+activeChar.getHeading());
-        }
-        if (Config.ACCEPT_GEOEDITOR_CONN)
-            if (GeoEditorListener.getInstance().getThread() != null  
-            		&& GeoEditorListener.getInstance().getThread().isWorking()  
-            		&& GeoEditorListener.getInstance().getThread().isSend(activeChar))
-            	GeoEditorListener.getInstance().getThread().sendGmPosition(_x,_y,(short)_z);
-        
-        /*if (Config.ACTIVATE_POSITION_RECORDER 
-        		&& !activeChar.isFlying() 
-        		&& Universe.getInstance().shouldLog(activeChar.getObjectId()))
-            Universe.getInstance().registerHeight(realX, realY, _z);*/
-       
-        if (activeChar.isFlying() || activeChar.isInsideZone(L2Character.ZONE_WATER))
-        {
-        	activeChar.setXYZ(realX, realY, _z);
-        	if (diffSq > 90000) // validate packet, may also cause z bounce if close to land
-        	{
-        		if (activeChar.isInBoat())
-        		{
-        			sendPacket(new ValidateLocationInVehicle(activeChar));
-        		}
-        		else if (activeChar.isInAirShip())
-        		{
-        			sendPacket(new ExValidateLocationInAirShip(activeChar));
-        		}
-        		else
-        		{
-        			activeChar.sendPacket(new ValidateLocation(activeChar));
-        		}
-        	}
-        }
-        else if (diffSq < 250000) // 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
-            {
-            	activeChar.setXYZ(realX,realY,_z);
-            	return;
-            }
-            if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
-            {
-            	if (!activeChar.isMoving() 
-            			|| !activeChar.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
-            	{
-            		// character is not moving, take coordinates from client
-            		if (diffSq < 2500) // 50*50 - attack won't work fluently if even small differences are corrected
-            			activeChar.setXYZ(realX, realY, _z);
-            		else
-            			activeChar.setXYZ(_x, _y, _z);
-            	}
-            	else
-            	{
-            		activeChar.setXYZ(realX, realY, _z);
-            	}
-            	activeChar.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 L2Character.updatePosition
-            if (Config.GEODATA > 0  
-        		&& (diffSq > 10000 || 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 - activeChar.getClientZ()) < 800 )
-            	{
-            		activeChar.setXYZ(realX, realY, _z);
-            		realZ = _z;
-            	}
-            	else
-            	{
-            		if (Config.DEVELOPER)
-            			_log.info(activeChar.getName() + ": Synchronizing position Server --> Client");
-            		if (activeChar.isInBoat())
-            		{
-            			sendPacket(new ValidateLocationInVehicle(activeChar));
-            		}
-            		else if (activeChar.isInAirShip())
-            		{
-            			sendPacket(new ExValidateLocationInAirShip(activeChar));
-            		}
-            		else
-            		{
-            			activeChar.sendPacket(new ValidateLocation(activeChar));
-            		}
-            	}
-            }
-        }
-        activeChar.setClientX(_x);
-        activeChar.setClientY(_y);
-        activeChar.setClientZ(_z);
-        activeChar.setClientHeading(_heading); // No real need to validate heading.
-        activeChar.setLastServerPosition(realX, realY, realZ);
-    }
-
-    /* (non-Javadoc)
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-     */
-    @Override
-	public String getType()
-    {
-        return _C__48_VALIDATEPOSITION;
-    }
+	{
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null
+				|| activeChar.isTeleporting()
+				|| activeChar.inObserverMode())
+			return;
+
+		final int realX = activeChar.getX();
+		final int realY = activeChar.getY();
+		int realZ = activeChar.getZ();
+
+		if (_x == 0 && _y == 0) 
+		{
+			if (realX != 0) // in this case this seems like a client error
+				return;
+		}
+
+		if(activeChar.getParty() != null && activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150)
+		{
+			activeChar.setLastPartyPosition(_x, _y, _z);
+			activeChar.getParty().broadcastToPartyMembers(activeChar,new PartyMemberPosition(activeChar));
+		}
+
+		final int dx = _x - realX;
+		final int dy = _y - realY;
+		final int dz = _z - realZ;
+		double diffSq = (dx*dx + dy*dy);
+
+		if (Config.DEVELOPER)
+		{
+			_log.fine("client pos: "+ _x + " "+ _y + " "+ _z +" head "+ _heading);
+			_log.fine("server pos: "+ realX + " "+realY+ " "+realZ +" head "+activeChar.getHeading());
+		}
 
- 
+		if (Config.ACCEPT_GEOEDITOR_CONN)
+			if (GeoEditorListener.getInstance().getThread() != null  
+					&& GeoEditorListener.getInstance().getThread().isWorking()  
+					&& GeoEditorListener.getInstance().getThread().isSend(activeChar))
+				GeoEditorListener.getInstance().getThread().sendGmPosition(_x,_y,(short)_z);
+
+		if (activeChar.isFlying() || activeChar.isInsideZone(L2Character.ZONE_WATER))
+		{
+			activeChar.setXYZ(realX, realY, _z);
+			if (diffSq > 90000) // validate packet, may also cause z bounce if close to land
+			{
+				if (activeChar.isInBoat())
+					sendPacket(new ValidateLocationInVehicle(activeChar));
+				else if (activeChar.isInAirShip())
+					sendPacket(new ExValidateLocationInAirShip(activeChar));
+				else
+					activeChar.sendPacket(new ValidateLocation(activeChar));
+			}
+		}
+		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
+			{
+				activeChar.setXYZ(realX,realY,_z);
+				return;
+			}
+			if (Config.COORD_SYNCHRONIZE == 1) // Trusting also client x,y coordinates (should not be used with geodata)
+			{
+				if (!activeChar.isMoving() 
+						|| !activeChar.validateMovementHeading(_heading)) // Heading changed on client = possible obstacle
+				{
+					// character is not moving, take coordinates from client
+					if (diffSq < 2500) // 50*50 - attack won't work fluently if even small differences are corrected
+						activeChar.setXYZ(realX, realY, _z);
+					else
+						activeChar.setXYZ(_x, _y, _z);
+				}
+				else
+					activeChar.setXYZ(realX, realY, _z);
+
+				activeChar.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 L2Character.updatePosition
+			if (Config.GEODATA > 0 && (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 - activeChar.getClientZ()) < 800 )
+				{
+					activeChar.setXYZ(realX, realY, _z);
+					realZ = _z;
+				}
+				else
+				{
+					if (Config.DEVELOPER)
+						_log.info(activeChar.getName() + ": Synchronizing position Server --> Client");
+
+					if (activeChar.isInBoat())
+						sendPacket(new ValidateLocationInVehicle(activeChar));
+					else if (activeChar.isInAirShip())
+						sendPacket(new ExValidateLocationInAirShip(activeChar));
+					else
+						activeChar.sendPacket(new ValidateLocation(activeChar));
+				}
+			}
+		}
+
+		activeChar.setClientX(_x);
+		activeChar.setClientY(_y);
+		activeChar.setClientZ(_z);
+		activeChar.setClientHeading(_heading); // No real need to validate heading.
+		activeChar.setLastServerPosition(realX, realY, realZ);
+	}
+
+	/* (non-Javadoc)
+	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
+	 */
+	@Override
+	public String getType()
+	{
+		return _C__48_VALIDATEPOSITION;
+	}
 }