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

Added missing final modifiers.

Browse Source
This commit is contained in:
MobiusDev
2015-12-26 12:03:36 +00:00
parent cc92e5d062
commit e0d681a17e
974 changed files with 5919 additions and 5917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNodeBuffer.java
View File

@@ -126,7 +126,7 @@ public class CellNodeBuffer
{
for (int j = 0; j < _mapSize; j++)
{
CellNode n = _buffer[i][j];
final CellNode n = _buffer[i][j];
if ((n == null) || !n.isInUse() || (n.getCost() <= 0))
{
continue;
@@ -257,7 +257,7 @@ public class CellNodeBuffer
private final CellNode addNode(int x, int y, int z, boolean diagonal)
{
CellNode newNode = getNode(x, y, z);
final CellNode newNode = getNode(x, y, z);
if (newNode == null)
{
return null;

30
trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellPathFinding.java
View File

@@ -60,7 +60,7 @@ public class CellPathFinding extends PathFinding
{
try
{
String[] array = Config.PATHFIND_BUFFERS.split(";");
final String[] array = Config.PATHFIND_BUFFERS.split(";");
_allBuffers = new BufferInfo[array.length];
@@ -94,27 +94,27 @@ public class CellPathFinding extends PathFinding
@Override
public List<AbstractNodeLoc> findPath(int x, int y, int z, int tx, int ty, int tz, int instanceId, boolean playable)
{
int gx = GeoData.getInstance().getGeoX(x);
int gy = GeoData.getInstance().getGeoY(y);
final int gx = GeoData.getInstance().getGeoX(x);
final int gy = GeoData.getInstance().getGeoY(y);
if (!GeoData.getInstance().hasGeo(x, y))
{
return null;
}
int gz = GeoData.getInstance().getHeight(x, y, z);
int gtx = GeoData.getInstance().getGeoX(tx);
int gty = GeoData.getInstance().getGeoY(ty);
final int gz = GeoData.getInstance().getHeight(x, y, z);
final int gtx = GeoData.getInstance().getGeoX(tx);
final int gty = GeoData.getInstance().getGeoY(ty);
if (!GeoData.getInstance().hasGeo(tx, ty))
{
return null;
}
int gtz = GeoData.getInstance().getHeight(tx, ty, tz);
CellNodeBuffer buffer = alloc(64 + (2 * Math.max(Math.abs(gx - gtx), Math.abs(gy - gty))), playable);
final int gtz = GeoData.getInstance().getHeight(tx, ty, tz);
final CellNodeBuffer buffer = alloc(64 + (2 * Math.max(Math.abs(gx - gtx), Math.abs(gy - gty))), playable);
if (buffer == null)
{
return null;
}
boolean debug = playable && Config.DEBUG_PATH;
final boolean debug = playable && Config.DEBUG_PATH;
if (debug)
{
@@ -136,7 +136,7 @@ public class CellPathFinding extends PathFinding
List<AbstractNodeLoc> path = null;
try
{
CellNode result = buffer.findPath(gx, gy, gz, gtx, gty, gtz);
final CellNode result = buffer.findPath(gx, gy, gz, gtx, gty, gtz);
if (debug)
{
@@ -178,7 +178,7 @@ public class CellPathFinding extends PathFinding
return path;
}
long timeStamp = System.currentTimeMillis();
final long timeStamp = System.currentTimeMillis();
_postFilterUses++;
if (playable)
{
@@ -202,8 +202,8 @@ public class CellPathFinding extends PathFinding
int midPoint = 0;
while (endPoint.hasNext())
{
AbstractNodeLoc locMiddle = path.get(midPoint);
AbstractNodeLoc locEnd = endPoint.next();
final AbstractNodeLoc locMiddle = path.get(midPoint);
final AbstractNodeLoc locEnd = endPoint.next();
if (GeoData.getInstance().canMove(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instanceId))
{
path.remove(midPoint);
@@ -246,8 +246,8 @@ public class CellPathFinding extends PathFinding
{
if (!Config.ADVANCED_DIAGONAL_STRATEGY && (node.getParent().getParent() != null))
{
int tmpX = node.getLoc().getNodeX() - node.getParent().getParent().getLoc().getNodeX();
int tmpY = node.getLoc().getNodeY() - node.getParent().getParent().getLoc().getNodeY();
final int tmpX = node.getLoc().getNodeX() - node.getParent().getParent().getLoc().getNodeX();
final int tmpY = node.getLoc().getNodeY() - node.getParent().getParent().getLoc().getNodeY();
if (Math.abs(tmpX) == Math.abs(tmpY))
{
directionX = tmpX;

78
trunk/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoPathFinding.java
View File

@@ -68,15 +68,15 @@ public class GeoPathFinding extends PathFinding
@Override
public List<AbstractNodeLoc> findPath(int x, int y, int z, int tx, int ty, int tz, int instanceId, boolean playable)
{
int gx = (x - L2World.MAP_MIN_X) >> 4;
int gy = (y - L2World.MAP_MIN_Y) >> 4;
short gz = (short) z;
int gtx = (tx - L2World.MAP_MIN_X) >> 4;
int gty = (ty - L2World.MAP_MIN_Y) >> 4;
short gtz = (short) tz;
final int gx = (x - L2World.MAP_MIN_X) >> 4;
final int gy = (y - L2World.MAP_MIN_Y) >> 4;
final short gz = (short) z;
final int gtx = (tx - L2World.MAP_MIN_X) >> 4;
final int gty = (ty - L2World.MAP_MIN_Y) >> 4;
final short gtz = (short) tz;
GeoNode start = readNode(gx, gy, gz);
GeoNode end = readNode(gtx, gty, gtz);
final GeoNode start = readNode(gx, gy, gz);
final GeoNode end = readNode(gtx, gty, gtz);
if ((start == null) || (end == null))
{
return null;
@@ -124,13 +124,13 @@ public class GeoPathFinding extends PathFinding
// load) level of intelligence though.
// List of Visited Nodes
FastNodeList visited = new FastNodeList(550);
final FastNodeList visited = new FastNodeList(550);
// List of Nodes to Visit
LinkedList<GeoNode> to_visit = new LinkedList<>();
final LinkedList<GeoNode> to_visit = new LinkedList<>();
to_visit.add(start);
int targetX = end.getLoc().getNodeX();
int targetY = end.getLoc().getNodeY();
final int targetX = end.getLoc().getNodeX();
final int targetY = end.getLoc().getNodeY();
int dx, dy;
boolean added;
@@ -155,7 +155,7 @@ public class GeoPathFinding extends PathFinding
i++;
visited.add(node);
node.attachNeighbors(readNeighbors(node));
GeoNode[] neighbors = node.getNeighbors();
final GeoNode[] neighbors = node.getNeighbors();
if (neighbors == null)
{
continue;
@@ -192,7 +192,7 @@ public class GeoPathFinding extends PathFinding
public List<AbstractNodeLoc> constructPath2(AbstractNode<GeoNodeLoc> node)
{
LinkedList<AbstractNodeLoc> path = new LinkedList<>();
final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
int previousDirectionX = -1000;
int previousDirectionY = -1000;
int directionX;
@@ -224,14 +224,14 @@ public class GeoPathFinding extends PathFinding
int idx = n.getNeighborsIdx();
int node_x = n.getLoc().getNodeX();
int node_y = n.getLoc().getNodeY();
final int node_x = n.getLoc().getNodeX();
final int node_y = n.getLoc().getNodeY();
// short node_z = n.getLoc().getZ();
short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y));
ByteBuffer pn = _pathNodes.get(regoffset);
final short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y));
final ByteBuffer pn = _pathNodes.get(regoffset);
List<AbstractNode<GeoNodeLoc>> neighbors = new ArrayList<>(8);
final List<AbstractNode<GeoNodeLoc>> neighbors = new ArrayList<>(8);
GeoNode newNode;
short new_node_x, new_node_y;
@@ -332,7 +332,7 @@ public class GeoPathFinding extends PathFinding
neighbors.add(newNode);
}
}
GeoNode[] result = new GeoNode[neighbors.size()];
final GeoNode[] result = new GeoNode[neighbors.size()];
return neighbors.toArray(result);
}
@@ -340,47 +340,47 @@ public class GeoPathFinding extends PathFinding
private GeoNode readNode(short node_x, short node_y, byte layer)
{
short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y));
final short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y));
if (!pathNodesExist(regoffset))
{
return null;
}
short nbx = getNodeBlock(node_x);
short nby = getNodeBlock(node_y);
final short nbx = getNodeBlock(node_x);
final short nby = getNodeBlock(node_y);
int idx = _pathNodesIndex.get(regoffset).get((nby << 8) + nbx);
ByteBuffer pn = _pathNodes.get(regoffset);
final ByteBuffer pn = _pathNodes.get(regoffset);
// reading
byte nodes = pn.get(idx);
final byte nodes = pn.get(idx);
idx += (layer * 10) + 1;// byte + layer*10byte
if (nodes < layer)
{
_log.warning("SmthWrong!");
}
short node_z = pn.getShort(idx);
final short node_z = pn.getShort(idx);
idx += 2;
return new GeoNode(new GeoNodeLoc(node_x, node_y, node_z), idx);
}
private GeoNode readNode(int gx, int gy, short z)
{
short node_x = getNodePos(gx);
short node_y = getNodePos(gy);
short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y));
final short node_x = getNodePos(gx);
final short node_y = getNodePos(gy);
final short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y));
if (!pathNodesExist(regoffset))
{
return null;
}
short nbx = getNodeBlock(node_x);
short nby = getNodeBlock(node_y);
final short nbx = getNodeBlock(node_x);
final short nby = getNodeBlock(node_y);
int idx = _pathNodesIndex.get(regoffset).get((nby << 8) + nbx);
ByteBuffer pn = _pathNodes.get(regoffset);
final ByteBuffer pn = _pathNodes.get(regoffset);
// reading
byte nodes = pn.get(idx++);
int idx2 = 0; // create index to nearlest node by z
short last_z = Short.MIN_VALUE;
while (nodes > 0)
{
short node_z = pn.getShort(idx);
final short node_z = pn.getShort(idx);
if (Math.abs(last_z - z) > Math.abs(node_z - z))
{
last_z = node_z;
@@ -412,8 +412,8 @@ public class GeoPathFinding extends PathFinding
return;
}
byte rx = Byte.parseByte(parts[0]);
byte ry = Byte.parseByte(parts[1]);
final byte rx = Byte.parseByte(parts[0]);
final byte ry = Byte.parseByte(parts[1]);
LoadPathNodeFile(rx, ry);
});
//@formatter:on
@@ -432,8 +432,8 @@ public class GeoPathFinding extends PathFinding
_log.warning("Failed to Load PathNode File: invalid region " + rx + "," + ry + Config.EOL);
return;
}
short regionoffset = getRegionOffset(rx, ry);
File file = new File(Config.PATHNODE_PATH.toString(), rx + "_" + ry + ".pn");
final short regionoffset = getRegionOffset(rx, ry);
final File file = new File(Config.PATHNODE_PATH.toString(), rx + "_" + ry + ".pn");
_log.info("Path Engine: - Loading: " + file.getName() + " -> region offset: " + regionoffset + " X: " + rx + " Y: " + ry);
int node = 0, size, index = 0;
@@ -454,11 +454,11 @@ public class GeoPathFinding extends PathFinding
}
// Indexing pathnode files, so we will know where each block starts
IntBuffer indexs = IntBuffer.allocate(65536);
final IntBuffer indexs = IntBuffer.allocate(65536);
while (node < 65536)
{
byte layer = nodes.get(index);
final byte layer = nodes.get(index);
indexs.put(node++, index);
index += (layer * 10) + 1;
}

6
trunk/java/com/l2jserver/gameserver/pathfinding/utils/BinaryNodeHeap.java
View File

@@ -41,10 +41,10 @@ public class BinaryNodeHeap
_list[pos] = n;
while (pos != 1)
{
int p2 = pos / 2;
final int p2 = pos / 2;
if (_list[pos].getCost() <= _list[p2].getCost())
{
GeoNode temp = _list[p2];
final GeoNode temp = _list[p2];
_list[p2] = _list[pos];
_list[pos] = temp;
pos = p2;
@@ -58,7 +58,7 @@ public class BinaryNodeHeap
public GeoNode removeFirst()
{
GeoNode first = _list[1];
final GeoNode first = _list[1];
_list[1] = _list[_size];
_list[_size] = null;
_size--;