Removal of CopyOnWriteArrayList from CellPathFinding.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -113,7 +113,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -178,28 +178,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instanceId))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -211,7 +218,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -230,7 +236,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -266,16 +272,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -327,7 +334,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -335,7 +342,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -113,7 +113,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -178,28 +178,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instanceId))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -211,7 +218,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -230,7 +236,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -266,16 +272,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -327,7 +334,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -335,7 +342,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -113,7 +113,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -178,28 +178,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instanceId))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -211,7 +218,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -230,7 +236,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -266,16 +272,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -327,7 +334,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -335,7 +342,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -113,7 +113,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -178,28 +178,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instanceId))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -211,7 +218,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -230,7 +236,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -266,16 +272,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -327,7 +334,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -335,7 +342,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -113,7 +113,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -178,28 +178,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instanceId))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -211,7 +218,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -230,7 +236,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -266,16 +272,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -327,7 +334,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -335,7 +342,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/geoengine/pathfinding/cellnodes/CellPathFinding.java

@@ -17,9 +17,9 @@
 package org.l2jmobius.gameserver.geoengine.pathfinding.cellnodes;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ListIterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -114,7 +114,7 @@ public class CellPathFinding extends PathFinding
 		{
 			if (_debugItems == null)
 			{
-				_debugItems = new CopyOnWriteArrayList<>();
+				_debugItems = new LinkedList<>();
 			}
 			else
 			{
@@ -179,28 +179,35 @@ public class CellPathFinding extends PathFinding
 			_postFilterPlayableUses++;
 		}
 		
-		boolean remove;
+		ListIterator<AbstractNodeLoc> middlePoint;
+		int currentX;
+		int currentY;
+		int currentZ;
 		int pass = 0;
+		boolean remove;
 		do
 		{
 			pass++;
 			_postFilterPasses++;
 			
 			remove = false;
-			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			middlePoint = path.listIterator();
-			endPoint.next();
+			currentX = x;
-			int currentX = x;
+			currentY = y;
-			int currentY = y;
+			currentZ = z;
-			int currentZ = z;
 			
-			int midPoint = 0;
+			while (middlePoint.hasNext())
-			while (endPoint.hasNext())
 			{
-				final AbstractNodeLoc locMiddle = path.get(midPoint);
+				final AbstractNodeLoc locMiddle = middlePoint.next();
-				final AbstractNodeLoc locEnd = endPoint.next();
+				if (!middlePoint.hasNext())
+				{
+					break;
+				}
+				
+				final AbstractNodeLoc locEnd = path.get(middlePoint.nextIndex());
 				if (GeoEngine.getInstance().canMoveToTarget(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instance))
 				{
-					path.remove(midPoint);
+					middlePoint.remove();
 					remove = true;
 					if (debug)
 					{
@@ -212,7 +219,6 @@ public class CellPathFinding extends PathFinding
 					currentX = locMiddle.getX();
 					currentY = locMiddle.getY();
 					currentZ = locMiddle.getZ();
-					midPoint++;
 				}
 			}
 		}
@@ -231,7 +237,7 @@ public class CellPathFinding extends PathFinding
 	
 	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node)
 	{
-		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
 		int previousDirectionX = Integer.MIN_VALUE;
 		int previousDirectionY = Integer.MIN_VALUE;
 		int directionX;
@@ -267,16 +273,17 @@ public class CellPathFinding extends PathFinding
 				previousDirectionX = directionX;
 				previousDirectionY = directionY;
 				
-				path.add(0, tempNode.getLoc());
+				path.addFirst(tempNode.getLoc());
 				tempNode.setLoc(null);
 			}
 			
 			tempNode = tempNode.getParent();
 		}
+		
 		return path;
 	}
 	
-	private final CellNodeBuffer alloc(int size, boolean playable)
+	private CellNodeBuffer alloc(int size, boolean playable)
 	{
 		CellNodeBuffer current = null;
 		for (BufferInfo i : _allBuffers)
@@ -328,7 +335,7 @@ public class CellPathFinding extends PathFinding
 		return current;
 	}
 	
-	private final void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -336,7 +343,7 @@ public class CellPathFinding extends PathFinding
 		_debugItems.add(item);
 	}
 	
-	private static final class BufferInfo
+	private static class BufferInfo
 	{
 		final int mapSize;
 		final int count;