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

Sync with L2JServer Jan 28th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-29 05:18:04 +00:00
parent 59e1db4a68
commit 2cb3a52ed2
224 changed files with 4690 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
trunk/java/com/l2jserver/commons/geodriver/GeoDriver.java
View File

@ -117,41 +117,21 @@ public final class GeoDriver
return getRegion(geoX, geoY).checkNearestNswe(geoX, geoY, worldZ, nswe);
}
public boolean checkNearestNswe(int geoX, int geoY, int worldZ, int nswe, int zDeltaLimit)
{
return getRegion(geoX, geoY).checkNearestNswe(geoX, geoY, worldZ, nswe, zDeltaLimit);
}
public int getNearestZ(int geoX, int geoY, int worldZ)
{
return getRegion(geoX, geoY).getNearestZ(geoX, geoY, worldZ);
}
public int getNearestZ(int geoX, int geoY, int worldZ, int zDeltaLimit)
{
return getRegion(geoX, geoY).getNearestZ(geoX, geoY, worldZ, zDeltaLimit);
}
public int getNextLowerZ(int geoX, int geoY, int worldZ)
{
return getRegion(geoX, geoY).getNextLowerZ(geoX, geoY, worldZ);
}
public int getNextLowerZ(int geoX, int geoY, int worldZ, int zDeltaLimit)
{
return getRegion(geoX, geoY).getNextLowerZ(geoX, geoY, worldZ, zDeltaLimit);
}
public int getNextHigherZ(int geoX, int geoY, int worldZ)
{
return getRegion(geoX, geoY).getNextHigherZ(geoX, geoY, worldZ);
}
public int getNextHigherZ(int geoX, int geoY, int worldZ, int zDeltaLimit)
{
return getRegion(geoX, geoY).getNextHigherZ(geoX, geoY, worldZ, zDeltaLimit);
}
public int getGeoX(int worldX)
{
if ((worldX < WORLD_MIN_X) || (worldX > WORLD_MAX_X))

8
trunk/java/com/l2jserver/commons/geodriver/IBlock.java
View File

@ -36,17 +36,9 @@ public interface IBlock
boolean checkNearestNswe(int geoX, int geoY, int worldZ, int nswe);
boolean checkNearestNswe(int geoX, int geoY, int worldZ, int nswe, int zDeltaLimit);
int getNearestZ(int geoX, int geoY, int worldZ);
int getNearestZ(int geoX, int geoY, int worldZ, int zDeltaLimit);
int getNextLowerZ(int geoX, int geoY, int worldZ);
int getNextLowerZ(int geoX, int geoY, int worldZ, int zDeltaLimit);
int getNextHigherZ(int geoX, int geoY, int worldZ);
int getNextHigherZ(int geoX, int geoY, int worldZ, int zDeltaLimit);
}

8
trunk/java/com/l2jserver/commons/geodriver/IRegion.java
View File

@ -39,19 +39,11 @@ public interface IRegion
boolean checkNearestNswe(int geoX, int geoY, int worldZ, int nswe);
boolean checkNearestNswe(int geoX, int geoY, int worldZ, int nswe, int zDeltaLimit);
int getNearestZ(int geoX, int geoY, int worldZ);
int getNearestZ(int geoX, int geoY, int worldZ, int zDeltaLimit);
int getNextLowerZ(int geoX, int geoY, int worldZ);
int getNextLowerZ(int geoX, int geoY, int worldZ, int zDeltaLimit);
int getNextHigherZ(int geoX, int geoY, int worldZ);
int getNextHigherZ(int geoX, int geoY, int worldZ, int zDeltaLimit);
boolean hasGeo();
}

54
trunk/java/com/l2jserver/commons/geodriver/blocks/AbstractBlock.java
View File

@ -1,54 +0,0 @@
/*
* Copyright (C) 2004-2015 L2J Server
*
* This file is part of L2J Server.
*
* L2J Server is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* L2J Server is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.commons.geodriver.blocks;
import com.l2jserver.commons.geodriver.IBlock;
/**
* @author HorridoJoho
*/
public abstract class AbstractBlock implements IBlock
{
private int limitZ(int z, int newZ, int deltaLimit)
{
if (Math.abs(z - newZ) > deltaLimit)
{
return z;
}
return newZ;
}
@Override
public int getNearestZ(int geoX, int geoY, int worldZ, int zDeltaLimit)
{
return limitZ(worldZ, getNearestZ(geoX, geoY, worldZ), zDeltaLimit);
}
@Override
public int getNextLowerZ(int geoX, int geoY, int worldZ, int zDeltaLimit)
{
return limitZ(worldZ, getNextLowerZ(geoX, geoY, worldZ), zDeltaLimit);
}
@Override
public int getNextHigherZ(int geoX, int geoY, int worldZ, int zDeltaLimit)
{
return limitZ(worldZ, getNextHigherZ(geoX, geoY, worldZ), zDeltaLimit);
}
}

9
trunk/java/com/l2jserver/commons/geodriver/blocks/ComplexBlock.java
View File

@ -25,7 +25,7 @@ import com.l2jserver.commons.geodriver.IBlock;
/**
* @author HorridoJoho
*/
public final class ComplexBlock extends AbstractBlock
public final class ComplexBlock implements IBlock
{
private final short[] _data;
@ -60,13 +60,6 @@ public final class ComplexBlock extends AbstractBlock
return (_getCellNSWE(geoX, geoY) & nswe) == nswe;
}
@Override
public boolean checkNearestNswe(int geoX, int geoY, int worldZ, int nswe, int zDeltaLimit)
{
int height = _getCellHeight(geoX, geoY);
return Math.abs(worldZ - height) > zDeltaLimit ? true : (_getCellNSWE(geoX, geoY) & nswe) == nswe;
}
@Override
public int getNearestZ(int geoX, int geoY, int worldZ)
{

10
trunk/java/com/l2jserver/commons/geodriver/blocks/FlatBlock.java
View File

@ -20,10 +20,12 @@ package com.l2jserver.commons.geodriver.blocks;
import java.nio.ByteBuffer;
import com.l2jserver.commons.geodriver.IBlock;
/**
* @author HorridoJoho
*/
public class FlatBlock extends AbstractBlock
public class FlatBlock implements IBlock
{
private final short _height;
@ -38,12 +40,6 @@ public class FlatBlock extends AbstractBlock
return true;
}
@Override
public boolean checkNearestNswe(int geoX, int geoY, int worldZ, int nswe, int zDeltaLimit)
{
return true;
}
@Override
public int getNearestZ(int geoX, int geoY, int worldZ)
{

12
trunk/java/com/l2jserver/commons/geodriver/blocks/MultilayerBlock.java
View File

@ -23,9 +23,9 @@ import java.nio.ByteBuffer;
import com.l2jserver.commons.geodriver.IBlock;
/**
* @author FBIagent
* @author HorridoJoho
*/
public class MultilayerBlock extends AbstractBlock
public class MultilayerBlock implements IBlock
{
private final byte[] _data;
@ -124,14 +124,6 @@ public class MultilayerBlock extends AbstractBlock
return (_getNearestNSWE(geoX, geoY, worldZ) & nswe) == nswe;
}
@Override
public boolean checkNearestNswe(int geoX, int geoY, int worldZ, int nswe, int zDeltaLimit)
{
short layer = _getNearestLayer(geoX, geoY, worldZ);
int height = _extractLayerHeight(layer);
return Math.abs(worldZ - height) > zDeltaLimit ? true : (_extractLayerNswe(layer) & nswe) == nswe;
}
@Override
public int getNearestZ(int geoX, int geoY, int worldZ)
{

24
trunk/java/com/l2jserver/commons/geodriver/regions/NullRegion.java
View File

@ -33,48 +33,24 @@ public final class NullRegion implements IRegion
return true;
}
@Override
public boolean checkNearestNswe(int geoX, int geoY, int worldZ, int nswe, int zDeltaLimit)
{
return true;
}
@Override
public int getNearestZ(int geoX, int geoY, int worldZ)
{
return worldZ;
}
@Override
public int getNearestZ(int geoX, int geoY, int worldZ, int zDeltaLimit)
{
return worldZ;
}
@Override
public int getNextLowerZ(int geoX, int geoY, int worldZ)
{
return worldZ;
}
@Override
public int getNextLowerZ(int geoX, int geoY, int worldZ, int zDeltaLimit)
{
return worldZ;
}
@Override
public int getNextHigherZ(int geoX, int geoY, int worldZ)
{
return worldZ;
}
@Override
public int getNextHigherZ(int geoX, int geoY, int worldZ, int zDeltaLimit)
{
return worldZ;
}
@Override
public boolean hasGeo()
{

24
trunk/java/com/l2jserver/commons/geodriver/regions/Region.java
View File

@ -66,48 +66,24 @@ public final class Region implements IRegion
return getBlock(geoX, geoY).checkNearestNswe(geoX, geoY, worldZ, nswe);
}
@Override
public boolean checkNearestNswe(int geoX, int geoY, int worldZ, int nswe, int zDeltaLimit)
{
return getBlock(geoX, geoY).checkNearestNswe(geoX, geoY, worldZ, nswe, zDeltaLimit);
}
@Override
public int getNearestZ(int geoX, int geoY, int worldZ)
{
return getBlock(geoX, geoY).getNearestZ(geoX, geoY, worldZ);
}
@Override
public int getNearestZ(int geoX, int geoY, int worldZ, int zDeltaLimit)
{
return getBlock(geoX, geoY).getNearestZ(geoX, geoY, worldZ, zDeltaLimit);
}
@Override
public int getNextLowerZ(int geoX, int geoY, int worldZ)
{
return getBlock(geoX, geoY).getNextLowerZ(geoX, geoY, worldZ);
}
@Override
public int getNextLowerZ(int geoX, int geoY, int worldZ, int zDeltaLimit)
{
return getBlock(geoX, geoY).getNextLowerZ(geoX, geoY, worldZ, zDeltaLimit);
}
@Override
public int getNextHigherZ(int geoX, int geoY, int worldZ)
{
return getBlock(geoX, geoY).getNextHigherZ(geoX, geoY, worldZ);
}
@Override
public int getNextHigherZ(int geoX, int geoY, int worldZ, int zDeltaLimit)
{
return getBlock(geoX, geoY).getNextHigherZ(geoX, geoY, worldZ, zDeltaLimit);
}
@Override
public boolean hasGeo()
{