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

-Dropped Javolution.

Browse Source 
-Removal of Q00344_1000YearsTheEndOfLamentation.
-Fixed starting conditions for Q00144_PailakaInjuredDragon.
-Fixed starting conditions for last Seven Sign quests.
-Added missing MonasteryOfSilence.xml instance spawns and doors.
-Removed many catacomb spawns.
This commit is contained in:
mobius
2015-02-08 21:01:32 +00:00
parent 141cdc5efa
commit 012eb3ed65
201 changed files with 817 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.pathfinding.cellnodes;
import java.util.ArrayList;
import java.util.concurrent.locks.ReentrantLock;
import javolution.util.FastList;
import com.l2jserver.Config;
/**
@ -113,9 +112,9 @@ public class CellNodeBuffer
return _lastElapsedTime;
}
public final FastList<CellNode> debugPath()
public final ArrayList<CellNode> debugPath()
{
FastList<CellNode> result = new FastList<>();
ArrayList<CellNode> result = new ArrayList<>();
for (CellNode n = _current; n.getParent() != null; n = (CellNode) n.getParent())
{

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

@ -24,8 +24,6 @@ import java.util.ListIterator;
import java.util.logging.Level;
import java.util.logging.Logger;
import javolution.util.FastList;
import com.l2jserver.Config;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.idfactory.IdFactory;
@ -50,7 +48,7 @@ public class CellPathFinding extends PathFinding
private int _postFilterPasses = 0;
private long _postFilterElapsed = 0;
private FastList<L2ItemInstance> _debugItems = null;
private ArrayList<L2ItemInstance> _debugItems = null;
public static CellPathFinding getInstance()
{
@ -121,7 +119,7 @@ public class CellPathFinding extends PathFinding
{
if (_debugItems == null)
{
_debugItems = new FastList<>();
_debugItems = new ArrayList<>();
}
else
{
@ -138,7 +136,7 @@ public class CellPathFinding extends PathFinding
}
}
FastList<AbstractNodeLoc> path = null;
ArrayList<AbstractNodeLoc> path = null;
try
{
CellNode result = buffer.findPath(gx, gy, gz, gtx, gty, gtz);
@ -244,9 +242,9 @@ public class CellPathFinding extends PathFinding
return path;
}
private FastList<AbstractNodeLoc> constructPath(AbstractNode node)
private ArrayList<AbstractNodeLoc> constructPath(AbstractNode node)
{
FastList<AbstractNodeLoc> path = new FastList<>();
ArrayList<AbstractNodeLoc> path = new ArrayList<>();
int previousDirectionX = Integer.MIN_VALUE;
int previousDirectionY = Integer.MIN_VALUE;
int directionX, directionY;
@ -280,7 +278,7 @@ public class CellPathFinding extends PathFinding
previousDirectionX = directionX;
previousDirectionY = directionY;
path.addFirst(node.getLoc());
path.add(node.getLoc());
node.setLoc(null);
}

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

@ -28,15 +28,14 @@ import java.nio.channels.FileChannel;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javolution.util.FastList;
import javolution.util.FastMap;
import com.l2jserver.Config;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.model.L2World;
@ -53,8 +52,8 @@ import com.l2jserver.gameserver.util.Util;
public class GeoPathFinding extends PathFinding
{
private static Logger _log = Logger.getLogger(GeoPathFinding.class.getName());
private static Map<Short, ByteBuffer> _pathNodes = new FastMap<>();
private static Map<Short, IntBuffer> _pathNodesIndex = new FastMap<>();
private static Map<Short, ByteBuffer> _pathNodes = new HashMap<>();
private static Map<Short, IntBuffer> _pathNodesIndex = new HashMap<>();
public static GeoPathFinding getInstance()
{
@ -226,7 +225,7 @@ public class GeoPathFinding extends PathFinding
short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y));
ByteBuffer pn = _pathNodes.get(regoffset);
List<AbstractNode> Neighbors = new FastList<>(8);
List<AbstractNode> Neighbors = new ArrayList<>(8);
GeoNode newNode;
short new_node_x, new_node_y;