Index: C:/eclipse/workspace/L2_GameServer/java/net/sf/l2j/gameserver/GameTimeController.java =================================================================== --- C:/eclipse/workspace/L2_GameServer/java/net/sf/l2j/gameserver/GameTimeController.java (revision 1513) +++ C:/eclipse/workspace/L2_GameServer/java/net/sf/l2j/gameserver/GameTimeController.java (working copy) @@ -19,10 +19,10 @@ package net.sf.l2j.gameserver; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; import java.util.logging.Logger; +import javolution.util.FastTable; import net.sf.l2j.Config; import net.sf.l2j.gameserver.ai.CtrlEvent; import net.sf.l2j.gameserver.model.L2Character; @@ -50,7 +50,7 @@ protected static long _gameStartTime; protected static boolean _isNight; - private static ArrayList movingObjects = new ArrayList(); + private static FastTable movingObjects = new FastTable(); protected TimerThread _timer; @@ -124,7 +124,7 @@ L2Character[] chars = movingObjects.toArray(new L2Character[movingObjects.size()]); // Create an ArrayList to contain all L2Character that are arrived to destination - ArrayList ended = null; + FastTable ended = null; // Go throw the table containing L2Character in movement for (int i=0; i < chars.length; i++) @@ -140,7 +140,7 @@ { movingObjects.remove(cha); if (ended == null) - ended = new ArrayList(); + ended = new FastTable(); ended.add(cha); } @@ -214,9 +214,9 @@ */ class MovingObjectArrived implements Runnable { - final ArrayList ended; + final FastTable ended; - MovingObjectArrived(ArrayList ended) + MovingObjectArrived(FastTable ended) { this.ended = ended; } Index: C:/eclipse/workspace/L2_GameServer/java/net/sf/l2j/util/WorldObjectSet.java =================================================================== --- C:/eclipse/workspace/L2_GameServer/java/net/sf/l2j/util/WorldObjectSet.java (revision 1513) +++ C:/eclipse/workspace/L2_GameServer/java/net/sf/l2j/util/WorldObjectSet.java (working copy) @@ -29,9 +29,8 @@ package net.sf.l2j.util; import java.util.Iterator; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; +import javolution.util.FastMap; import net.sf.l2j.gameserver.model.L2Object; /** @@ -42,8 +41,8 @@ public class WorldObjectSet extends L2ObjectSet { - private Map objectMap = new ConcurrentHashMap(); - + private FastMap objectMap = new FastMap().setShared(true); + /* (non-Javadoc) * @see net.sf.l2j.util.L2ObjectSet#size() */ Index: C:/eclipse/workspace/L2_GameServer/.classpath =================================================================== --- C:/eclipse/workspace/L2_GameServer/.classpath (revision 1513) +++ C:/eclipse/workspace/L2_GameServer/.classpath (working copy) @@ -9,5 +9,6 @@ + Index: C:/eclipse/workspace/L2_GameServer/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- C:/eclipse/workspace/L2_GameServer/.settings/org.eclipse.jdt.ui.prefs (revision 1513) +++ C:/eclipse/workspace/L2_GameServer/.settings/org.eclipse.jdt.ui.prefs (working copy) @@ -1,9 +1,13 @@ -#Mon Aug 22 12:26:03 CEST 2005 +#Mon Nov 14 05:04:47 MSK 2005 eclipse.preferences.version=1 formatter_settings_version=8 internal.default.compliance=default org.eclipse.jdt.ui.exception.name=e org.eclipse.jdt.ui.gettersetter.use.is=true +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; org.eclipse.jdt.ui.javadoc=true org.eclipse.jdt.ui.keywordthis=false +org.eclipse.jdt.ui.ondemandthreshold=99 org.eclipse.jdt.ui.overrideannotation=true +org.eclipse.jdt.ui.text.custom_code_templates=