Skip to content

Instantly share code, notes, and snippets.

@ChaosPaladin

ChaosPaladin/drop javolution (core).diff

Forked from Pandragon/drop javolution (core).diff
Created March 20, 2016 13:27
Show Gist options
  • Save ChaosPaladin/0e35e564a524b170b451 to your computer and use it in GitHub Desktop.
Save ChaosPaladin/0e35e564a524b170b451 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
drop javolution (core).diff
### Eclipse Workspace Patch 1.0
#P L2J_Server_BETA
Index: java/com/l2jserver/gameserver/instancemanager/MailManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/MailManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/MailManager.java (working copy)
@@ -23,6 +23,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -29,8 +30,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.idfactory.IdFactory;
@@ -142,7 +141,7 @@
public final List<Message> getInbox(int objectId)
{
- final List<Message> inbox = new FastList<>();
+ final List<Message> inbox = new ArrayList<>();
for (Message msg : getMessages())
{
if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver())
@@ -155,7 +154,7 @@
public final List<Message> getOutbox(int objectId)
{
- final List<Message> outbox = new FastList<>();
+ final List<Message> outbox = new ArrayList<>();
for (Message msg : getMessages())
{
if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender())
Index: java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java
===================================================================
--- java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java (working copy)
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -40,8 +41,6 @@
import javax.script.ScriptException;
import javax.script.SimpleScriptContext;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.script.jython.JythonScriptEngine;
@@ -60,8 +59,8 @@
return SingletonHolder._instance;
}
- private final Map<String, ScriptEngine> _nameEngines = new FastMap<>();
- private final Map<String, ScriptEngine> _extEngines = new FastMap<>();
+ private final Map<String, ScriptEngine> _nameEngines = new HashMap<>();
+ private final Map<String, ScriptEngine> _extEngines = new HashMap<>();
private final List<ScriptManager<?>> _scriptManagers = new LinkedList<>();
private File _currentLoadingScript;
Index: java/com/l2jserver/gameserver/communitybbs/Manager/BaseBBSManager.java
===================================================================
--- java/com/l2jserver/gameserver/communitybbs/Manager/BaseBBSManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/communitybbs/Manager/BaseBBSManager.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.communitybbs.Manager;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.ShowBoard;
@@ -87,7 +86,7 @@
*/
protected void send1002(L2PcInstance activeChar, String string, String string2, String string3)
{
- List<String> _arg = new FastList<>();
+ List<String> _arg = new ArrayList<>();
_arg.add("0");
_arg.add("0");
_arg.add("0");
Index: java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java
===================================================================
--- java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java (working copy)
@@ -23,11 +23,10 @@
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.GameTimeController;
@@ -47,7 +46,7 @@
{
protected static final Logger _log = Logger.getLogger(ItemContainer.class.getName());
- protected final List<L2ItemInstance> _items = new FastList<L2ItemInstance>().shared();
+ protected final List<L2ItemInstance> _items = new CopyOnWriteArrayList<>();
protected ItemContainer()
{
Index: java/com/l2jserver/gameserver/datatables/EventDroplist.java
===================================================================
--- java/com/l2jserver/gameserver/datatables/EventDroplist.java (revision 6473)
+++ java/com/l2jserver/gameserver/datatables/EventDroplist.java (working copy)
@@ -18,11 +18,10 @@
*/
package com.l2jserver.gameserver.datatables;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.script.DateRange;
import com.l2jserver.gameserver.script.EventDrop;
@@ -37,7 +36,7 @@
/**
* The table containing all DataDrop object
*/
- private static final List<DateDrop> _allNpcDateDrops = new FastList<>();
+ private static final List<DateDrop> _allNpcDateDrops = new ArrayList<>();
public static class DateDrop
{
@@ -106,7 +105,7 @@
*/
public List<DateDrop> getAllDrops()
{
- final List<DateDrop> list = new FastList<>();
+ final List<DateDrop> list = new ArrayList<>();
final Date currentDate = new Date();
for (DateDrop drop : _allNpcDateDrops)
{
Index: java/com/l2jserver/gameserver/model/L2WorldRegion.java
===================================================================
--- java/com/l2jserver/gameserver/model/L2WorldRegion.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/L2WorldRegion.java (working copy)
@@ -22,12 +22,10 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.SpawnTable;
@@ -58,8 +56,8 @@
public L2WorldRegion(int pTileX, int pTileY)
{
- _allPlayable = new FastMap<Integer, L2Playable>().shared();
- _visibleObjects = new FastMap<Integer, L2Object>().shared();
+ _allPlayable = new ConcurrentHashMap<>();
+ _visibleObjects = new ConcurrentHashMap<>();
_surroundingRegions = new ArrayList<>();
_tileX = pTileX;
@@ -74,7 +72,7 @@
{
_active = false;
}
- _zones = new FastList<>();
+ _zones = new ArrayList<>();
}
public List<L2ZoneType> getZones()
@@ -463,7 +461,7 @@
}
/**
- * @return the FastList _surroundingRegions containing all L2WorldRegion around the current L2WorldRegion
+ * @return the ArrayList _surroundingRegions containing all L2WorldRegion around the current L2WorldRegion
*/
public List<L2WorldRegion> getSurroundingRegions()
{
Index: java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java (working copy)
@@ -30,8 +30,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.NpcData;
@@ -60,7 +58,7 @@
protected static Logger _log = Logger.getLogger(GrandBossManager.class.getName());
- protected static Map<Integer, L2GrandBossInstance> _bosses = new FastMap<>();
+ protected static Map<Integer, L2GrandBossInstance> _bosses = new HashMap<>();
protected static Map<Integer, StatsSet> _storedInfo = new HashMap<>();
@@ -123,7 +121,7 @@
*/
public void initZones()
{
- FastMap<Integer, L2FastList<Integer>> zones = new FastMap<>();
+ HashMap<Integer, L2FastList<Integer>> zones = new HashMap<>();
if (_zones == null)
{
Index: java/com/l2jserver/gameserver/communitybbs/Manager/TopicBBSManager.java
===================================================================
--- java/com/l2jserver/gameserver/communitybbs/Manager/TopicBBSManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/communitybbs/Manager/TopicBBSManager.java (working copy)
@@ -19,15 +19,14 @@
package com.l2jserver.gameserver.communitybbs.Manager;
import java.text.DateFormat;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.communitybbs.BB.Forum;
import com.l2jserver.gameserver.communitybbs.BB.Post;
import com.l2jserver.gameserver.communitybbs.BB.Topic;
@@ -43,8 +42,8 @@
protected TopicBBSManager()
{
- _table = new FastList<>();
- _maxId = new FastMap<Forum, Integer>().shared();
+ _table = new ArrayList<>();
+ _maxId = new ConcurrentHashMap<>();
}
public void addTopic(Topic tt)
Index: java/com/l2jserver/gameserver/instancemanager/FortManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/FortManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/FortManager.java (working copy)
@@ -21,12 +21,11 @@
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
+import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.InstanceListManager;
import com.l2jserver.gameserver.model.L2Clan;
@@ -159,7 +158,7 @@
{
if (_forts == null)
{
- _forts = new FastList<>();
+ _forts = new ArrayList<>();
}
return _forts;
}
Index: java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
===================================================================
--- java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java (working copy)
@@ -21,15 +21,14 @@
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.Announcements;
@@ -73,8 +72,8 @@
protected final Logger _log;
- private final FastMap<Integer, L2SiegeClan> _attackers = new FastMap<>();
- private FastList<L2Spawn> _guards;
+ private final HashMap<Integer, L2SiegeClan> _attackers = new HashMap<>();
+ private ArrayList<L2Spawn> _guards;
public SiegableHall _hall;
public ScheduledFuture<?> _siegeTask;
@@ -150,7 +149,7 @@
{
if (_guards == null)
{
- _guards = new FastList<>();
+ _guards = new ArrayList<>();
try (Connection con = L2DatabaseFactory.getInstance().getConnection();
PreparedStatement statement = con.prepareStatement(SQL_LOAD_GUARDS))
{
@@ -221,7 +220,7 @@
// XXX Attacker clans management -----------------------------
- public final FastMap<Integer, L2SiegeClan> getAttackers()
+ public final HashMap<Integer, L2SiegeClan> getAttackers()
{
return _attackers;
}
@@ -258,7 +257,7 @@
@Override
public List<L2SiegeClan> getAttackerClans()
{
- FastList<L2SiegeClan> result = new FastList<>();
+ ArrayList<L2SiegeClan> result = new ArrayList<>();
result.addAll(_attackers.values());
return result;
}
@@ -267,7 +266,7 @@
public List<L2PcInstance> getAttackersInZone()
{
final Collection<L2PcInstance> list = _hall.getSiegeZone().getPlayersInside();
- List<L2PcInstance> attackers = new FastList<>();
+ List<L2PcInstance> attackers = new ArrayList<>();
for (L2PcInstance pc : list)
{
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java
===================================================================
--- java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java (working copy)
@@ -20,10 +20,9 @@
import java.util.List;
import java.util.StringTokenizer;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.communitybbs.CommunityBoard;
@@ -59,7 +58,7 @@
public final class RequestBypassToServer extends L2GameClientPacket
{
private static final String _C__23_REQUESTBYPASSTOSERVER = "[C] 23 RequestBypassToServer";
- private static final List<RequestBypassToServerListener> _listeners = new FastList<RequestBypassToServerListener>().shared();
+ private static final List<RequestBypassToServerListener> _listeners = new CopyOnWriteArrayList<>();
// FIXME: This is for compatibility, will be changed when bypass functionallity got an overhaul by Nos
private static final String[] _possibleNonHtmlCommands =
{
Index: java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java (working copy)
@@ -28,8 +28,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
@@ -108,10 +106,10 @@
{
for (Castle castle : CastleManager.getInstance().getCastles())
{
- FastList<SeedProduction> production = new FastList<>();
- FastList<SeedProduction> productionNext = new FastList<>();
- FastList<CropProcure> procure = new FastList<>();
- FastList<CropProcure> procureNext = new FastList<>();
+ ArrayList<SeedProduction> production = new ArrayList<>();
+ ArrayList<SeedProduction> productionNext = new ArrayList<>();
+ ArrayList<CropProcure> procure = new ArrayList<>();
+ ArrayList<CropProcure> procureNext = new ArrayList<>();
// restore seed production info
statementProduction.setInt(1, castle.getResidenceId());
@@ -355,7 +353,7 @@
}
else
{
- FastList<SeedProduction> production = new FastList<>();
+ ArrayList<SeedProduction> production = new ArrayList<>();
for (SeedProduction s : c.getSeedProduction(PERIOD_CURRENT))
{
s.setCanProduce(s.getStartProduce());
@@ -363,7 +361,7 @@
}
c.setSeedProduction(production, PERIOD_NEXT);
- FastList<CropProcure> procure = new FastList<>();
+ ArrayList<CropProcure> procure = new ArrayList<>();
for (CropProcure cr : c.getCropProcure(PERIOD_CURRENT))
{
cr.setAmount(cr.getStartAmount());
@@ -397,8 +395,8 @@
if (c.getOwnerId() <= 0)
{ // Castle has no owner
- c.setCropProcure(new FastList<CropProcure>(), PERIOD_NEXT);
- c.setSeedProduction(new FastList<SeedProduction>(), PERIOD_NEXT);
+ c.setCropProcure(new ArrayList<CropProcure>(), PERIOD_NEXT);
+ c.setSeedProduction(new ArrayList<SeedProduction>(), PERIOD_NEXT);
}
else if (c.getTreasury() < c.getManorCost(PERIOD_NEXT))
{
Index: java/com/l2jserver/gameserver/model/actor/instance/L2ControlTowerInstance.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/instance/L2ControlTowerInstance.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/actor/instance/L2ControlTowerInstance.java (working copy)
@@ -18,11 +18,10 @@
*/
package com.l2jserver.gameserver.model.actor.instance;
+import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.enums.InstanceType;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.actor.L2Character;
@@ -86,7 +85,7 @@
{
if (_guards == null)
{
- _guards = new FastList<>();
+ _guards = new ArrayList<>();
}
}
}
Index: java/com/l2jserver/gameserver/communitybbs/BB/Post.java
===================================================================
--- java/com/l2jserver/gameserver/communitybbs/BB/Post.java (revision 6473)
+++ java/com/l2jserver/gameserver/communitybbs/BB/Post.java (working copy)
@@ -21,12 +21,11 @@
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.communitybbs.Manager.PostBBSManager;
@@ -60,7 +59,7 @@
*/
public Post(String _PostOwner, int _PostOwnerID, long date, int tid, int _PostForumID, String txt)
{
- _post = new FastList<>();
+ _post = new ArrayList<>();
CPost cp = new CPost();
cp.postId = 0;
cp.postOwner = _PostOwner;
@@ -96,7 +95,7 @@
public Post(Topic t)
{
- _post = new FastList<>();
+ _post = new ArrayList<>();
load(t);
}
Index: java/com/l2jserver/gameserver/model/L2Territory.java
===================================================================
--- java/com/l2jserver/gameserver/model/L2Territory.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/L2Territory.java (working copy)
@@ -18,11 +18,10 @@
*/
package com.l2jserver.gameserver.model;
+import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.util.Rnd;
/**
@@ -59,7 +58,7 @@
public L2Territory(int terr)
{
- _points = new FastList<>();
+ _points = new ArrayList<>();
_terr = terr;
_xMin = 999999;
_xMax = -999999;
Index: java/com/l2jserver/gameserver/model/actor/knownlist/CharKnownList.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/knownlist/CharKnownList.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/actor/knownlist/CharKnownList.java (working copy)
@@ -24,8 +24,6 @@
import java.util.List;
import java.util.Map;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Summon;
@@ -208,7 +206,7 @@
public Collection<L2Character> getKnownCharacters()
{
- FastList<L2Character> result = new FastList<>();
+ ArrayList<L2Character> result = new ArrayList<>();
final Collection<L2Object> objs = getKnownObjects().values();
for (L2Object obj : objs)
Index: java/com/l2jserver/gameserver/network/serverpackets/ExSendManorList.java
===================================================================
--- java/com/l2jserver/gameserver/network/serverpackets/ExSendManorList.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/serverpackets/ExSendManorList.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
/**
* @author l3x
*/
@@ -29,7 +28,7 @@
{
private final List<String> _manors;
- public ExSendManorList(FastList<String> manors)
+ public ExSendManorList(ArrayList<String> manors)
{
_manors = manors;
}
Index: java/com/l2jserver/gameserver/model/zone/type/L2BossZone.java
===================================================================
--- java/com/l2jserver/gameserver/model/zone/type/L2BossZone.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/zone/type/L2BossZone.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.model.zone.type;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.GameServer;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
@@ -56,7 +55,7 @@
// track the times that players got disconnected. Players are allowed
// to log back into the zone as long as their log-out was within _timeInvade time...
// <player objectId, expiration time in milliseconds>
- private final FastMap<Integer, Long> _playerAllowedReEntryTimes;
+ private final HashMap<Integer, Long> _playerAllowedReEntryTimes;
// track the players admitted to the zone who should be allowed back in
// after reboot/server downtime (outside of their control), within 30 of server restart
@@ -66,12 +65,12 @@
public Settings()
{
- _playerAllowedReEntryTimes = new FastMap<>();
+ _playerAllowedReEntryTimes = new HashMap<>();
_playersAllowed = new L2FastList<>();
_raidList = new L2FastList<>();
}
- public FastMap<Integer, Long> getPlayerAllowedReEntryTimes()
+ public HashMap<Integer, Long> getPlayerAllowedReEntryTimes()
{
return _playerAllowedReEntryTimes;
}
Index: java/com/l2jserver/gameserver/model/L2ContactList.java
===================================================================
--- java/com/l2jserver/gameserver/model/L2ContactList.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/L2ContactList.java (working copy)
@@ -22,11 +22,10 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -53,7 +52,7 @@
public L2ContactList(L2PcInstance player)
{
activeChar = player;
- _contacts = new FastList<String>().shared();
+ _contacts = new CopyOnWriteArrayList<>();
restore();
}
Index: java/com/l2jserver/gameserver/model/holders/PlayerEventHolder.java
===================================================================
--- java/com/l2jserver/gameserver/model/holders/PlayerEventHolder.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/holders/PlayerEventHolder.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.model.holders;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -69,7 +68,7 @@
_pvpKills = player.getPvpKills();
_pkKills = player.getPkKills();
_karma = player.getKarma();
- _kills = new FastList<>();
+ _kills = new ArrayList<>();
_sitForced = sitForced;
}
Index: java/com/l2jserver/gameserver/model/multisell/PreparedListContainer.java
===================================================================
--- java/com/l2jserver/gameserver/model/multisell/PreparedListContainer.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/multisell/PreparedListContainer.java (working copy)
@@ -20,8 +20,6 @@
import java.util.ArrayList;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.L2Armor;
@@ -66,8 +64,8 @@
items = player.getInventory().getUniqueItems(false, false, false);
}
- // size is not known - using FastList
- _entries = new FastList<>();
+ // size is not known - using ArrayList
+ _entries = new ArrayList<>();
for (L2ItemInstance item : items)
{
// only do the match up on equippable items that are not currently equipped
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestManorList.java
===================================================================
--- java/com/l2jserver/gameserver/network/clientpackets/RequestManorList.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestManorList.java (working copy)
@@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
-import javolution.util.FastList;
+import java.util.ArrayList;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.ExSendManorList;
@@ -44,7 +44,7 @@
{
return;
}
- FastList<String> manorsName = new FastList<>();
+ ArrayList<String> manorsName = new ArrayList<>();
manorsName.add("gludio");
manorsName.add("dion");
manorsName.add("giran");
Index: java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java (working copy)
@@ -23,13 +23,12 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Calendar;
+import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
@@ -49,10 +48,10 @@
{
private static final Logger _log = Logger.getLogger(RaidBossSpawnManager.class.getName());
- protected static final Map<Integer, L2RaidBossInstance> _bosses = new FastMap<>();
- protected static final Map<Integer, L2Spawn> _spawns = new FastMap<>();
- protected static final Map<Integer, StatsSet> _storedInfo = new FastMap<>();
- protected static final Map<Integer, ScheduledFuture<?>> _schedules = new FastMap<>();
+ protected static final Map<Integer, L2RaidBossInstance> _bosses = new HashMap<>();
+ protected static final Map<Integer, L2Spawn> _spawns = new HashMap<>();
+ protected static final Map<Integer, StatsSet> _storedInfo = new HashMap<>();
+ protected static final Map<Integer, ScheduledFuture<?>> _schedules = new HashMap<>();
public static enum StatusEnum
{
Index: java/com/l2jserver/gameserver/util/MinionList.java
===================================================================
--- java/com/l2jserver/gameserver/util/MinionList.java (revision 6473)
+++ java/com/l2jserver/gameserver/util/MinionList.java (working copy)
@@ -18,14 +18,13 @@
*/
package com.l2jserver.gameserver.util;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger;
-import javolution.util.FastList;
-import javolution.util.FastSet;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.NpcData;
@@ -58,7 +57,7 @@
}
_master = pMaster;
- _minionReferences = new FastList<L2MonsterInstance>().shared();
+ _minionReferences = new CopyOnWriteArrayList<>();
}
/**
@@ -154,7 +153,7 @@
// if master has spawn and can respawn - try to reuse minions
if ((_reusedMinionReferences == null) && (_master.getTemplate().getMinionData() != null) && (_master.getSpawn() != null) && _master.getSpawn().isRespawnEnabled())
{
- _reusedMinionReferences = new FastList<L2MonsterInstance>().shared();
+ _reusedMinionReferences = new CopyOnWriteArrayList<>();
}
}
@@ -424,7 +423,7 @@
public final int lazyCountSpawnedMinionsGroups()
{
- Set<Integer> seenGroups = new FastSet<>();
+ Set<Integer> seenGroups = new HashSet<>();
for (L2MonsterInstance minion : _minionReferences)
{
if (minion == null)
Index: java/com/l2jserver/gameserver/pathfinding/geonodes/GeoPathFinding.java
===================================================================
--- java/com/l2jserver/gameserver/pathfinding/geonodes/GeoPathFinding.java (revision 6473)
+++ java/com/l2jserver/gameserver/pathfinding/geonodes/GeoPathFinding.java (working copy)
@@ -27,6 +27,8 @@
import java.nio.IntBuffer;
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -34,9 +36,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.model.L2World;
@@ -52,8 +51,8 @@
public class GeoPathFinding extends PathFinding
{
private static Logger _log = Logger.getLogger(GeoPathFinding.class.getName());
- private static Map<Short, ByteBuffer> _pathNodes = new FastMap<>();
- private static Map<Short, IntBuffer> _pathNodesIndex = new FastMap<>();
+ private static Map<Short, ByteBuffer> _pathNodes = new HashMap<>();
+ private static Map<Short, IntBuffer> _pathNodesIndex = new HashMap<>();
public static GeoPathFinding getInstance()
{
@@ -225,7 +224,7 @@
short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y));
ByteBuffer pn = _pathNodes.get(regoffset);
- List<AbstractNode> Neighbors = new FastList<>(8);
+ List<AbstractNode> Neighbors = new ArrayList<>(8);
GeoNode newNode;
short new_node_x, new_node_y;
Index: java/com/l2jserver/gameserver/model/olympiad/OlympiadManager.java
===================================================================
--- java/com/l2jserver/gameserver/model/olympiad/OlympiadManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/olympiad/OlympiadManager.java (working copy)
@@ -21,10 +21,9 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
@@ -47,9 +46,9 @@
protected OlympiadManager()
{
- _nonClassBasedRegisters = new FastList<Integer>().shared();
- _classBasedRegisters = new FastMap<Integer, List<Integer>>().shared();
- _teamsBasedRegisters = new FastList<List<Integer>>().shared();
+ _nonClassBasedRegisters = new CopyOnWriteArrayList<>();
+ _classBasedRegisters = new ConcurrentHashMap<>();
+ _teamsBasedRegisters = new CopyOnWriteArrayList<>();
}
public static final OlympiadManager getInstance()
@@ -81,7 +80,7 @@
{
if (result == null)
{
- result = new FastList<>();
+ result = new ArrayList<>();
}
result.add(classList.getValue());
@@ -258,7 +257,7 @@
}
else
{
- classed = new FastList<Integer>().shared();
+ classed = new CopyOnWriteArrayList<>();
classed.add(charId);
_classBasedRegisters.put(player.getBaseClass(), classed);
}
Index: java/com/l2jserver/gameserver/engines/items/DocumentItem.java
===================================================================
--- java/com/l2jserver/gameserver/engines/items/DocumentItem.java (revision 6473)
+++ java/com/l2jserver/gameserver/engines/items/DocumentItem.java (working copy)
@@ -21,11 +21,10 @@
import java.io.File;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
-import javolution.util.FastList;
-
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -40,7 +39,7 @@
public final class DocumentItem extends DocumentBase
{
private Item _currentItem = null;
- private final List<L2Item> _itemsInFile = new FastList<>();
+ private final List<L2Item> _itemsInFile = new ArrayList<>();
/**
* @param file
Index: java/com/l2jserver/gameserver/model/entity/Duel.java
===================================================================
--- java/com/l2jserver/gameserver/model/entity/Duel.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/entity/Duel.java (working copy)
@@ -18,13 +18,12 @@
*/
package com.l2jserver.gameserver.model.entity;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.enums.DuelResult;
@@ -83,7 +82,7 @@
_duelEndTime.add(Calendar.SECOND, 120);
}
- _playerConditions = new FastList<>();
+ _playerConditions = new ArrayList<>();
setFinished(false);
@@ -108,7 +107,7 @@
private double _cp;
private boolean _paDuel;
private int _x, _y, _z;
- private FastList<Skill> _debuffs;
+ private ArrayList<Skill> _debuffs;
public PlayerCondition(L2PcInstance player, boolean partyDuel)
{
@@ -160,7 +159,7 @@
{
if (_debuffs == null)
{
- _debuffs = new FastList<>();
+ _debuffs = new ArrayList<>();
}
_debuffs.add(debuff);
Index: java/com/l2jserver/tools/images/ImagesTable.java
===================================================================
--- java/com/l2jserver/tools/images/ImagesTable.java (revision 6473)
+++ java/com/l2jserver/tools/images/ImagesTable.java (working copy)
@@ -18,12 +18,11 @@
*/
package com.l2jserver.tools.images;
+import java.util.HashMap;
import java.util.Map;
import javax.swing.ImageIcon;
-import javolution.util.FastMap;
-
/**
* Usage of this class causes images to be loaded and kept in memory, and therefore should only be used by helper applications.<br>
* Some icons from famfamfam (http://www.famfamfam.com/) credit *MUST* be given.
@@ -31,7 +30,7 @@
*/
public class ImagesTable
{
- private static final Map<String, ImageIcon> IMAGES = new FastMap<>();
+ private static final Map<String, ImageIcon> IMAGES = new HashMap<>();
public static final String IMAGES_DIRECTORY = "../images/";
Index: java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.model.actor.instance;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.MonsterRace;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.enums.InstanceType;
@@ -101,8 +100,8 @@
{
_notInitialized = false;
- // _history = new FastList<>();
- _managers = new FastList<>();
+ // _history = new ArrayList<>();
+ _managers = new ArrayList<>();
ThreadPoolManager s = ThreadPoolManager.getInstance();
s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_TICKETS_AVAILABLE_FOR_S1_RACE), 0, 10 * MINUTE);
Index: java/com/l2jserver/status/Status.java
===================================================================
--- java/com/l2jserver/status/Status.java (revision 6473)
+++ java/com/l2jserver/status/Status.java (working copy)
@@ -24,12 +24,11 @@
import java.io.InputStream;
import java.net.ServerSocket;
import java.net.Socket;
+import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.Server;
import com.l2jserver.util.Rnd;
@@ -124,7 +123,7 @@
}
statusServerSocket = new ServerSocket(_statusPort);
_uptime = (int) System.currentTimeMillis();
- _loginStatus = new FastList<>();
+ _loginStatus = new ArrayList<>();
}
private String rndPW(int length)
@@ -155,7 +154,7 @@
public void sendMessageToTelnets(String msg)
{
- List<LoginStatusThread> lsToRemove = new FastList<>();
+ List<LoginStatusThread> lsToRemove = new ArrayList<>();
for (LoginStatusThread ls : _loginStatus)
{
if (ls.isInterrupted())
Index: java/com/l2jserver/gameserver/network/serverpackets/SellList.java
===================================================================
--- java/com/l2jserver/gameserver/network/serverpackets/SellList.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/serverpackets/SellList.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
@@ -35,7 +34,7 @@
private final L2PcInstance _activeChar;
private final L2MerchantInstance _lease;
private final long _money;
- private final List<L2ItemInstance> _selllist = new FastList<>();
+ private final List<L2ItemInstance> _selllist = new ArrayList<>();
public SellList(L2PcInstance player)
{
Index: java/com/l2jserver/gameserver/instancemanager/DayNightSpawnManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/DayNightSpawnManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/DayNightSpawnManager.java (working copy)
@@ -19,13 +19,12 @@
package com.l2jserver.gameserver.instancemanager;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -54,7 +53,7 @@
{
_dayCreatures = new ArrayList<>();
_nightCreatures = new ArrayList<>();
- _bosses = new FastMap<>();
+ _bosses = new HashMap<>();
}
public void addDayCreature(L2Spawn spawnDat)
Index: java/com/l2jserver/gameserver/model/entity/DimensionalRift.java
===================================================================
--- java/com/l2jserver/gameserver/model/entity/DimensionalRift.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/entity/DimensionalRift.java (working copy)
@@ -18,12 +18,11 @@
*/
package com.l2jserver.gameserver.model.entity;
+import java.util.ArrayList;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.Future;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.instancemanager.DimensionalRiftManager;
@@ -44,7 +43,7 @@
{
protected byte _type;
protected L2Party _party;
- protected FastList<Byte> _completedRooms = new FastList<>();
+ protected ArrayList<Byte> _completedRooms = new ArrayList<>();
private static final long seconds_5 = 5000L;
// private static final int MILLISECONDS_IN_MINUTE = 60000;
protected byte jumps_current = 0;
@@ -58,8 +57,8 @@
protected byte _choosenRoom = -1;
private boolean _hasJumped = false;
- protected FastList<L2PcInstance> deadPlayers = new FastList<>();
- protected FastList<L2PcInstance> revivedInWaitingRoom = new FastList<>();
+ protected ArrayList<L2PcInstance> deadPlayers = new ArrayList<>();
+ protected ArrayList<L2PcInstance> revivedInWaitingRoom = new ArrayList<>();
private boolean isBossRoom = false;
public DimensionalRift(L2Party party, byte type, byte room)
@@ -309,7 +308,7 @@
if (_choosenRoom == -1)
{
- FastList<Byte> emptyRooms;
+ ArrayList<Byte> emptyRooms;
do
{
emptyRooms = DimensionalRiftManager.getInstance().getFreeRooms(_type);
@@ -464,12 +463,12 @@
}
}
- public FastList<L2PcInstance> getDeadMemberList()
+ public ArrayList<L2PcInstance> getDeadMemberList()
{
return deadPlayers;
}
- public FastList<L2PcInstance> getRevivedAtWaitingRoom()
+ public ArrayList<L2PcInstance> getRevivedAtWaitingRoom()
{
return revivedInWaitingRoom;
}
Index: java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java (working copy)
@@ -21,6 +21,7 @@
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
@@ -31,9 +32,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
@@ -124,9 +122,9 @@
};
// @formatter:on
- protected Map<Integer, Boolean> _archonSpawned = new FastMap<>();
- protected Map<Integer, Boolean> _hallInUse = new FastMap<>();
- protected Map<Integer, L2PcInstance> _challengers = new FastMap<>();
+ protected Map<Integer, Boolean> _archonSpawned = new HashMap<>();
+ protected Map<Integer, Boolean> _hallInUse = new HashMap<>();
+ protected Map<Integer, L2PcInstance> _challengers = new HashMap<>();
protected Map<Integer, int[]> _startHallSpawns = new HashMap<>();
protected Map<Integer, Integer> _hallGateKeepers = new HashMap<>();
protected Map<Integer, Integer> _keyBoxNpc = new HashMap<>();
@@ -147,7 +145,7 @@
protected List<L2Spawn> _managers;
protected List<L2Spawn> _dukeFinalSpawns;
protected List<L2Spawn> _emperorsGraveSpawns;
- protected List<L2Npc> _allMobs = new FastList<>();
+ protected List<L2Npc> _allMobs = new ArrayList<>();
private long _attackTimeEnd = 0;
private long _coolDownTimeEnd = 0;
@@ -276,7 +274,7 @@
protected void spawnManagers()
{
- _managers = new FastList<>();
+ _managers = new ArrayList<>();
int i = 31921;
for (L2Spawn spawnDat; i <= 31924; i++)
@@ -518,7 +516,7 @@
ps2.setInt(2, 1);
try (ResultSet rs2 = ps2.executeQuery())
{
- _physicalSpawns = new FastList<>();
+ _physicalSpawns = new ArrayList<>();
while (rs2.next())
{
template1 = NpcData.getInstance().getTemplate(rs2.getInt("npc_templateid"));
@@ -575,7 +573,7 @@
ps2.setInt(2, 2);
try (ResultSet rset2 = ps2.executeQuery())
{
- _magicalSpawns = new FastList<>();
+ _magicalSpawns = new ArrayList<>();
while (rset2.next())
{
@@ -636,7 +634,7 @@
{
ps2.clearParameters();
- _dukeFinalSpawns = new FastList<>();
+ _dukeFinalSpawns = new ArrayList<>();
while (rset2.next())
{
@@ -695,7 +693,7 @@
ps2.setInt(2, 6);
try (ResultSet rs2 = ps2.executeQuery())
{
- _emperorsGraveSpawns = new FastList<>();
+ _emperorsGraveSpawns = new ArrayList<>();
while (rs2.next())
{
@@ -1071,7 +1069,7 @@
if (Config.FS_PARTY_MEMBER_COUNT > 1)
{
- List<L2PcInstance> members = new FastList<>();
+ List<L2PcInstance> members = new ArrayList<>();
for (L2PcInstance mem : player.getParty().getMembers())
{
if (!mem.isDead() && Util.checkIfInRange(700, player, mem, true))
@@ -1105,7 +1103,7 @@
}
if ((Config.FS_PARTY_MEMBER_COUNT <= 1) && player.isInParty())
{
- List<L2PcInstance> members = new FastList<>();
+ List<L2PcInstance> members = new ArrayList<>();
for (L2PcInstance mem : player.getParty().getMembers())
{
if (!mem.isDead() && Util.checkIfInRange(700, player, mem, true))
@@ -1184,7 +1182,7 @@
}
List<L2Spawn> monsterList;
- List<L2SepulcherMonsterInstance> mobs = new FastList<>();
+ List<L2SepulcherMonsterInstance> mobs = new ArrayList<>();
L2Spawn keyBoxMobSpawn;
if (Rnd.get(2) == 0)
Index: java/com/l2jserver/gameserver/instancemanager/InstanceManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/InstanceManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/InstanceManager.java (working copy)
@@ -24,8 +24,6 @@
import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
-
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -40,12 +38,12 @@
*/
public final class InstanceManager extends DocumentParser
{
- private static final Map<Integer, Instance> _instanceList = new FastMap<>();
- private final Map<Integer, InstanceWorld> _instanceWorlds = new FastMap<>();
+ private static final Map<Integer, Instance> _instanceList = new HashMap<>();
+ private final Map<Integer, InstanceWorld> _instanceWorlds = new HashMap<>();
private int _dynamic = 300000;
// InstanceId Names
private static final Map<Integer, String> _instanceIdNames = new HashMap<>();
- private final Map<Integer, Map<Integer, Long>> _playerInstanceTimes = new FastMap<>();
+ private final Map<Integer, Map<Integer, Long>> _playerInstanceTimes = new HashMap<>();
// SQL Queries
private static final String ADD_INSTANCE_TIME = "INSERT INTO character_instance_time (charId,instanceId,time) values (?,?,?) ON DUPLICATE KEY UPDATE time=?";
private static final String RESTORE_INSTANCE_TIMES = "SELECT instanceId,time FROM character_instance_time WHERE charId=?";
@@ -158,7 +156,7 @@
{
return; // already restored
}
- _playerInstanceTimes.put(playerObjId, new FastMap<Integer, Long>());
+ _playerInstanceTimes.put(playerObjId, new HashMap<Integer, Long>());
try (Connection con = L2DatabaseFactory.getInstance().getConnection();
PreparedStatement ps = con.prepareStatement(RESTORE_INSTANCE_TIMES))
{
Index: java/com/l2jserver/gameserver/model/entity/Castle.java
===================================================================
--- java/com/l2jserver/gameserver/model/entity/Castle.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/entity/Castle.java (working copy)
@@ -23,13 +23,12 @@
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.CastleUpdater;
@@ -257,7 +256,7 @@
/*
* if (getResidenceId() == 7 || castleId == 9) // Goddard and Schuttgart _nbArtifact = 2;
*/
- _function = new FastMap<>();
+ _function = new HashMap<>();
initResidenceZone();
if (getOwnerId() != 0)
{
Index: java/com/l2jserver/gameserver/datatables/MerchantPriceConfigTable.java
===================================================================
--- java/com/l2jserver/gameserver/datatables/MerchantPriceConfigTable.java (revision 6473)
+++ java/com/l2jserver/gameserver/datatables/MerchantPriceConfigTable.java (working copy)
@@ -20,6 +20,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -27,8 +28,6 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import javolution.util.FastMap;
-
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
@@ -53,7 +52,7 @@
private static final String MPCS_FILE = "MerchantPriceConfig.xml";
- private final Map<Integer, MerchantPriceConfig> _mpcs = new FastMap<>();
+ private final Map<Integer, MerchantPriceConfig> _mpcs = new HashMap<>();
private MerchantPriceConfig _defaultMpc;
public MerchantPriceConfig getMerchantPriceConfig(L2MerchantInstance npc)
Index: java/com/l2jserver/gameserver/model/AutoSpawnHandler.java
===================================================================
--- java/com/l2jserver/gameserver/model/AutoSpawnHandler.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/AutoSpawnHandler.java (working copy)
@@ -22,6 +22,8 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ScheduledFuture;
@@ -29,9 +31,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.Announcements;
import com.l2jserver.gameserver.ThreadPoolManager;
@@ -75,8 +74,8 @@
protected AutoSpawnHandler()
{
- _registeredSpawns = new FastMap<>();
- _runningSpawns = new FastMap<>();
+ _registeredSpawns = new HashMap<>();
+ _runningSpawns = new HashMap<>();
restoreSpawnData();
}
@@ -111,8 +110,8 @@
}
// create clean list
- _registeredSpawns = new FastMap<>();
- _runningSpawns = new FastMap<>();
+ _registeredSpawns = new HashMap<>();
+ _runningSpawns = new HashMap<>();
// load
restoreSpawnData();
@@ -372,7 +371,7 @@
public Map<Integer, AutoSpawnInstance> getAutoSpawnInstances(int npcId)
{
- Map<Integer, AutoSpawnInstance> spawnInstList = new FastMap<>();
+ Map<Integer, AutoSpawnInstance> spawnInstList = new HashMap<>();
for (AutoSpawnInstance spawnInst : _registeredSpawns.values())
{
@@ -606,9 +605,9 @@
protected int _lastLocIndex = -1;
- private final List<L2Npc> _npcList = new FastList<>();
+ private final List<L2Npc> _npcList = new ArrayList<>();
- private final List<Location> _locList = new FastList<>();
+ private final List<Location> _locList = new ArrayList<>();
private boolean _spawnActive;
@@ -693,7 +692,7 @@
public L2Spawn[] getSpawns()
{
- List<L2Spawn> npcSpawns = new FastList<>();
+ List<L2Spawn> npcSpawns = new ArrayList<>();
for (L2Npc npcInst : _npcList)
{
Index: java/com/l2jserver/gameserver/instancemanager/CastleManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/CastleManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/CastleManager.java (working copy)
@@ -22,6 +22,7 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Statement;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -28,8 +29,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.InstanceListManager;
import com.l2jserver.gameserver.SevenSigns;
@@ -182,7 +181,7 @@
{
if (_castles == null)
{
- _castles = new FastList<>();
+ _castles = new ArrayList<>();
}
return _castles;
}
Index: java/com/l2jserver/gameserver/network/serverpackets/FriendList.java
===================================================================
--- java/com/l2jserver/gameserver/network/serverpackets/FriendList.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/serverpackets/FriendList.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -51,7 +50,7 @@
public FriendList(L2PcInstance player)
{
- _info = new FastList<>(player.getFriendList().size());
+ _info = new ArrayList<>(player.getFriendList().size());
for (int objId : player.getFriendList())
{
String name = CharNameTable.getInstance().getNameById(objId);
Index: java/com/l2jserver/gameserver/model/DimensionalRiftRoom.java
===================================================================
--- java/com/l2jserver/gameserver/model/DimensionalRiftRoom.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/DimensionalRiftRoom.java (working copy)
@@ -20,9 +20,8 @@
import java.awt.Polygon;
import java.awt.Shape;
+import java.util.ArrayList;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.util.Rnd;
@@ -43,8 +42,8 @@
private final int[] _teleportCoords;
private final Shape _s;
private final boolean _isBossRoom;
- private final FastList<L2Spawn> _roomSpawns;
- protected final FastList<L2Npc> _roomMobs;
+ private final ArrayList<L2Spawn> _roomSpawns;
+ protected final ArrayList<L2Npc> _roomMobs;
private boolean _partyInside = false;
public DimensionalRiftRoom(byte type, byte room, int xMin, int xMax, int yMin, int yMax, int zMin, int zMax, int xT, int yT, int zT, boolean isBossRoom)
@@ -64,8 +63,8 @@
zT
};
_isBossRoom = isBossRoom;
- _roomSpawns = new FastList<>();
- _roomMobs = new FastList<>();
+ _roomSpawns = new ArrayList<>();
+ _roomMobs = new ArrayList<>();
_s = new Polygon(new int[]
{
xMin,
@@ -116,7 +115,7 @@
return _isBossRoom;
}
- public FastList<L2Spawn> getSpawns()
+ public ArrayList<L2Spawn> getSpawns()
{
return _roomSpawns;
}
Index: java/com/l2jserver/gameserver/model/actor/instance/L2SignsPriestInstance.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/instance/L2SignsPriestInstance.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/actor/instance/L2SignsPriestInstance.java (working copy)
@@ -21,8 +21,6 @@
import java.util.StringTokenizer;
import java.util.logging.Level;
-import javolution.text.TextBuilder;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.SevenSigns;
import com.l2jserver.gameserver.cache.HtmCache;
@@ -888,7 +886,7 @@
showChatWindow(player, val, fileSuffix, false);
break;
case 20: // Seal Status (for when joining a cabal)
- TextBuilder contentBuffer = new TextBuilder();
+ StringBuilder contentBuffer = new StringBuilder();
if (this instanceof L2DawnPriestInstance)
{
Index: java/com/l2jserver/gameserver/ThreadPoolManager.java
===================================================================
--- java/com/l2jserver/gameserver/ThreadPoolManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/ThreadPoolManager.java (working copy)
@@ -31,10 +31,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-import javolution.util.FastSet;
-
import com.l2jserver.Config;
import com.l2jserver.util.StringUtil;
@@ -326,11 +322,6 @@
" |- PoolSize: " + _generalThreadPool.getPoolSize(),
" |- CompletedTasks: " + _generalThreadPool.getCompletedTaskCount(),
" |- QueuedTasks: " + _generalThreadPool.getQueue().size(),
- " | -------",
- " + Javolution stats:",
- " |- FastList: " + FastList.report(),
- " |- FastMap: " + FastMap.report(),
- " |- FastSet: " + FastSet.report(),
" | -------"
};
}
Index: java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java
===================================================================
--- java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java (working copy)
@@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
-import javolution.util.FastList;
+import java.util.ArrayList;
import com.l2jserver.gameserver.datatables.EnchantSkillGroupsData;
import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
@@ -26,7 +26,7 @@
public final class ExEnchantSkillInfo extends L2GameServerPacket
{
- private final FastList<Integer> _routes; // skill lvls for each route
+ private final ArrayList<Integer> _routes; // skill lvls for each route
private final int _id;
private final int _lvl;
@@ -34,7 +34,7 @@
public ExEnchantSkillInfo(int id, int lvl)
{
- _routes = new FastList<>();
+ _routes = new ArrayList<>();
_id = id;
_lvl = lvl;
Index: java/com/l2jserver/gameserver/network/serverpackets/SellListProcure.java
===================================================================
--- java/com/l2jserver/gameserver/network/serverpackets/SellListProcure.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/serverpackets/SellListProcure.java (working copy)
@@ -18,12 +18,11 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.instancemanager.CastleManager;
import com.l2jserver.gameserver.model.CropProcure;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -33,8 +32,8 @@
{
private final L2PcInstance _activeChar;
private final long _money;
- private final Map<L2ItemInstance, Long> _sellList = new FastMap<>();
- private List<CropProcure> _procureList = new FastList<>();
+ private final Map<L2ItemInstance, Long> _sellList = new HashMap<>();
+ private List<CropProcure> _procureList = new ArrayList<>();
private final int _castle;
public SellListProcure(L2PcInstance player, int castleId)
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java
===================================================================
--- java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java (working copy)
@@ -18,11 +18,10 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
+import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.BuyListData;
@@ -168,7 +167,7 @@
}
long totalPrice = 0;
- _item_list = new FastMap<>();
+ _item_list = new HashMap<>();
for (int i = 0; i < _count; i++)
{
Index: java/com/l2jserver/gameserver/model/L2Object.java
===================================================================
--- java/com/l2jserver/gameserver/model/L2Object.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/L2Object.java (working copy)
@@ -19,10 +19,9 @@
package com.l2jserver.gameserver.model;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.enums.InstanceType;
import com.l2jserver.gameserver.enums.ShotType;
import com.l2jserver.gameserver.handler.ActionHandler;
@@ -516,7 +515,7 @@
{
if (_scripts == null)
{
- _scripts = new FastMap<String, Object>().shared();
+ _scripts = new ConcurrentHashMap<>();
}
}
}
Index: java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java (working copy)
@@ -21,11 +21,10 @@
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
+import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.model.L2Clan;
@@ -46,7 +45,7 @@
private static final Logger _log = Logger.getLogger(CHSiegeManager.class.getName());
private static final String SQL_LOAD_HALLS = "SELECT * FROM siegable_clanhall";
- private final FastMap<Integer, SiegableHall> _siegableHalls = new FastMap<>();
+ private final HashMap<Integer, SiegableHall> _siegableHalls = new HashMap<>();
protected CHSiegeManager()
{
@@ -87,7 +86,7 @@
}
}
- public FastMap<Integer, SiegableHall> getConquerableHalls()
+ public HashMap<Integer, SiegableHall> getConquerableHalls()
{
return _siegableHalls;
}
Index: java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java
===================================================================
--- java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java (revision 6473)
+++ java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java (working copy)
@@ -19,11 +19,10 @@
package com.l2jserver.gameserver.engines.skills;
import java.io.File;
+import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
-import javolution.util.FastList;
-
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -54,12 +53,12 @@
public StatsSet[] enchsets7;
public StatsSet[] enchsets8;
public int currentLevel;
- public List<Skill> skills = new FastList<>();
- public List<Skill> currentSkills = new FastList<>();
+ public List<Skill> skills = new ArrayList<>();
+ public List<Skill> currentSkills = new ArrayList<>();
}
private SkillInfo _currentSkill;
- private final List<Skill> _skillsInFile = new FastList<>();
+ private final List<Skill> _skillsInFile = new ArrayList<>();
public DocumentSkill(File file)
{
@@ -1491,7 +1490,7 @@
private void makeSkills()
{
int count = 0;
- _currentSkill.currentSkills = new FastList<>(_currentSkill.sets.length + _currentSkill.enchsets1.length + _currentSkill.enchsets2.length + _currentSkill.enchsets3.length + _currentSkill.enchsets4.length + _currentSkill.enchsets5.length + _currentSkill.enchsets6.length + _currentSkill.enchsets7.length + _currentSkill.enchsets8.length);
+ _currentSkill.currentSkills = new ArrayList<>(_currentSkill.sets.length + _currentSkill.enchsets1.length + _currentSkill.enchsets2.length + _currentSkill.enchsets3.length + _currentSkill.enchsets4.length + _currentSkill.enchsets5.length + _currentSkill.enchsets6.length + _currentSkill.enchsets7.length + _currentSkill.enchsets8.length);
StatsSet set;
for (int i = 0; i < _currentSkill.sets.length; i++)
{
Index: java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java
===================================================================
--- java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java (working copy)
@@ -19,6 +19,7 @@
package com.l2jserver.gameserver.network.clientpackets;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
@@ -26,8 +27,6 @@
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.datatables.CharTemplateTable;
@@ -61,7 +60,7 @@
{
private static final String _C__0C_CHARACTERCREATE = "[C] 0C CharacterCreate";
protected static final Logger _logAccounting = Logger.getLogger("accounting");
- private static final List<PlayerListener> _listeners = new FastList<PlayerListener>().shared();
+ private static final List<PlayerListener> _listeners = new CopyOnWriteArrayList<PlayerListener>();
// cSdddddddddddd
private String _name;
Index: java/com/l2jserver/gameserver/taskmanager/AutoAnnounceTaskManager.java
===================================================================
--- java/com/l2jserver/gameserver/taskmanager/AutoAnnounceTaskManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/taskmanager/AutoAnnounceTaskManager.java (working copy)
@@ -22,12 +22,11 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Statement;
+import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
@@ -40,7 +39,7 @@
{
private static final Logger _log = Logger.getLogger(AutoAnnounceTaskManager.class.getName());
- protected final List<AutoAnnouncement> _announces = new FastList<>();
+ protected final List<AutoAnnouncement> _announces = new ArrayList<>();
private int _nextId = 1;
protected AutoAnnounceTaskManager()
Index: java/com/l2jserver/gameserver/model/olympiad/Olympiad.java
===================================================================
--- java/com/l2jserver/gameserver/model/olympiad/Olympiad.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/olympiad/Olympiad.java (working copy)
@@ -34,8 +34,6 @@
import java.util.logging.LogRecord;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.Announcements;
@@ -57,7 +55,7 @@
protected static final Logger _log = Logger.getLogger(Olympiad.class.getName());
protected static final Logger _logResults = Logger.getLogger("olympiad");
- private static final Map<Integer, StatsSet> _nobles = new FastMap<>();
+ private static final Map<Integer, StatsSet> _nobles = new HashMap<>();
protected static L2FastList<StatsSet> _heroesToBe;
private static final Map<Integer, Integer> _noblesRank = new HashMap<>();
Index: java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java
===================================================================
--- java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java (working copy)
@@ -26,8 +26,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.datatables.ArmorSetsData;
@@ -121,7 +119,7 @@
ChangeRecorder(Inventory inventory)
{
_inventory = inventory;
- _changed = new FastList<>();
+ _changed = new ArrayList<>();
_inventory.addPaperdollListener(this);
}
Index: java/com/l2jserver/loginserver/mail/MailSystem.java
===================================================================
--- java/com/l2jserver/loginserver/mail/MailSystem.java (revision 6473)
+++ java/com/l2jserver/loginserver/mail/MailSystem.java (working copy)
@@ -22,6 +22,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -28,8 +29,6 @@
import javax.xml.parsers.DocumentBuilderFactory;
-import javolution.util.FastMap;
-
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -41,7 +40,7 @@
public class MailSystem
{
private static final Logger _log = Logger.getLogger(MailSystem.class.getName());
- private final Map<String, MailContent> _mailData = new FastMap<>();
+ private final Map<String, MailContent> _mailData = new HashMap<>();
public static MailSystem getInstance()
{
Index: java/com/l2jserver/gameserver/instancemanager/SiegeManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/SiegeManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/SiegeManager.java (working copy)
@@ -29,8 +29,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.datatables.SkillData;
@@ -311,7 +309,7 @@
public final List<Siege> getSieges()
{
- FastList<Siege> sieges = new FastList<>();
+ ArrayList<Siege> sieges = new ArrayList<>();
for (Castle castle : CastleManager.getInstance().getCastles())
{
sieges.add(castle.getSiege());
Index: java/com/l2jserver/gameserver/model/zone/type/L2RespawnZone.java
===================================================================
--- java/com/l2jserver/gameserver/model/zone/type/L2RespawnZone.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/zone/type/L2RespawnZone.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.model.zone.type;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.enums.PcRace;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -32,7 +31,7 @@
*/
public class L2RespawnZone extends L2ZoneType
{
- private final Map<PcRace, String> _raceRespawnPoint = new FastMap<>();
+ private final Map<PcRace, String> _raceRespawnPoint = new HashMap<>();
public L2RespawnZone(int id)
{
Index: java/com/l2jserver/gameserver/model/variables/AbstractVariables.java
===================================================================
--- java/com/l2jserver/gameserver/model/variables/AbstractVariables.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/variables/AbstractVariables.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.model.variables;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.interfaces.IRestorable;
import com.l2jserver.gameserver.model.interfaces.IStorable;
@@ -35,7 +34,7 @@
public AbstractVariables()
{
- super(new FastMap<String, Object>().shared());
+ super(new ConcurrentHashMap<String, Object>());
}
/**
Index: java/com/l2jserver/gameserver/engines/DocumentBase.java
===================================================================
--- java/com/l2jserver/gameserver/engines/DocumentBase.java (revision 6473)
+++ java/com/l2jserver/gameserver/engines/DocumentBase.java (working copy)
@@ -20,6 +20,7 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -30,8 +31,6 @@
import javax.xml.parsers.DocumentBuilderFactory;
-import javolution.util.FastMap;
-
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -151,7 +150,7 @@
protected DocumentBase(File pFile)
{
_file = pFile;
- _tables = new FastMap<>();
+ _tables = new HashMap<>();
}
public Document parse()
@@ -182,7 +181,7 @@
protected void resetTable()
{
- _tables = new FastMap<>();
+ _tables = new HashMap<>();
}
protected void setTable(String name, String[] table)
Index: java/com/l2jserver/gameserver/model/entity/Fort.java
===================================================================
--- java/com/l2jserver/gameserver/model/entity/Fort.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/entity/Fort.java (working copy)
@@ -33,9 +33,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.FortUpdater;
@@ -82,14 +79,14 @@
private int _state = 0;
private int _castleId = 0;
private int _supplyLvL = 0;
- private final FastMap<Integer, FortFunction> _function;
+ private final HashMap<Integer, FortFunction> _function;
private final ScheduledFuture<?>[] _FortUpdater = new ScheduledFuture<?>[2];
// Spawn Data
private boolean _isSuspiciousMerchantSpawned = false;
- private final FastList<L2Spawn> _siegeNpcs = new FastList<>();
- private final FastList<L2Spawn> _npcCommanders = new FastList<>();
- private final FastList<L2Spawn> _specialEnvoys = new FastList<>();
+ private final ArrayList<L2Spawn> _siegeNpcs = new ArrayList<>();
+ private final ArrayList<L2Spawn> _npcCommanders = new ArrayList<>();
+ private final ArrayList<L2Spawn> _specialEnvoys = new ArrayList<>();
private final Map<Integer, Integer> _envoyCastles = new HashMap<>(2);
private final Set<Integer> _availableCastles = new HashSet<>(1);
@@ -248,7 +245,7 @@
super(fortId);
load();
loadFlagPoles();
- _function = new FastMap<>();
+ _function = new HashMap<>();
if (getOwnerClan() != null)
{
setVisibleFlag(true);
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponList.java
===================================================================
--- java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponList.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponList.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.network.serverpackets.ExCursedWeaponList;
@@ -50,7 +49,7 @@
}
// send a ExCursedWeaponList :p
- List<Integer> list = new FastList<>();
+ List<Integer> list = new ArrayList<>();
for (int id : CursedWeaponsManager.getInstance().getCursedWeaponsIds())
{
list.add(id);
Index: java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java (working copy)
@@ -21,12 +21,11 @@
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
+import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.model.L2Clan;
@@ -48,7 +47,7 @@
private final Map<Integer, AuctionableHall> _clanHall;
private final Map<Integer, AuctionableHall> _freeClanHall;
private final Map<Integer, AuctionableHall> _allAuctionableClanHalls;
- private static Map<Integer, ClanHall> _allClanHalls = new FastMap<>();
+ private static Map<Integer, ClanHall> _allClanHalls = new HashMap<>();
private boolean _loaded = false;
public boolean loaded()
@@ -58,9 +57,9 @@
protected ClanHallManager()
{
- _clanHall = new FastMap<>();
- _freeClanHall = new FastMap<>();
- _allAuctionableClanHalls = new FastMap<>();
+ _clanHall = new HashMap<>();
+ _freeClanHall = new HashMap<>();
+ _allAuctionableClanHalls = new HashMap<>();
load();
}
Index: java/com/l2jserver/gameserver/model/PartyMatchWaitingList.java
===================================================================
--- java/com/l2jserver/gameserver/model/PartyMatchWaitingList.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/PartyMatchWaitingList.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.model;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
@@ -33,7 +32,7 @@
protected PartyMatchWaitingList()
{
- _members = new FastList<>();
+ _members = new ArrayList<>();
}
public void addPlayer(L2PcInstance player)
Index: java/com/l2jserver/gameserver/instancemanager/DuelManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/DuelManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/DuelManager.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.instancemanager;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Duel;
import com.l2jserver.gameserver.model.skills.Skill;
@@ -34,7 +33,7 @@
protected DuelManager()
{
- _duels = new FastList<>();
+ _duels = new ArrayList<>();
}
private int getNextDuelId()
Index: java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java
===================================================================
--- java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java (working copy)
@@ -21,12 +21,11 @@
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.datatables.ClanTable;
@@ -193,7 +192,7 @@
private static CharSelectInfoPackage[] loadCharacterSelectInfo(String loginName)
{
CharSelectInfoPackage charInfopackage;
- List<CharSelectInfoPackage> characterList = new FastList<>();
+ List<CharSelectInfoPackage> characterList = new ArrayList<>();
try (Connection con = L2DatabaseFactory.getInstance().getConnection();
PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate"))
Index: java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java
===================================================================
--- java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java (working copy)
@@ -19,10 +19,9 @@
package com.l2jserver.gameserver.network.clientpackets;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.network.serverpackets.CharDeleteFail;
import com.l2jserver.gameserver.network.serverpackets.CharDeleteSuccess;
@@ -37,7 +36,7 @@
public final class CharacterDelete extends L2GameClientPacket
{
private static final String _C__0C_CHARACTERDELETE = "[C] 0D CharacterDelete";
- private static final List<PlayerListener> _listeners = new FastList<PlayerListener>().shared();
+ private static final List<PlayerListener> _listeners = new CopyOnWriteArrayList<>();
// cd
private int _charSlot;
Index: java/com/l2jserver/loginserver/FloodProtectedListener.java
===================================================================
--- java/com/l2jserver/loginserver/FloodProtectedListener.java (revision 6473)
+++ java/com/l2jserver/loginserver/FloodProtectedListener.java (working copy)
@@ -22,12 +22,11 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
+import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
/**
@@ -36,7 +35,7 @@
public abstract class FloodProtectedListener extends Thread
{
private final Logger _log = Logger.getLogger(FloodProtectedListener.class.getName());
- private final Map<String, ForeignConnection> _floodProtection = new FastMap<>();
+ private final Map<String, ForeignConnection> _floodProtection = new HashMap<>();
private final String _listenIp;
private final int _port;
private ServerSocket _serverSocket;
Index: java/com/l2jserver/loginserver/GameServerListener.java
===================================================================
--- java/com/l2jserver/loginserver/GameServerListener.java (revision 6473)
+++ java/com/l2jserver/loginserver/GameServerListener.java (working copy)
@@ -20,10 +20,9 @@
import java.io.IOException;
import java.net.Socket;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
/**
@@ -31,7 +30,7 @@
*/
public class GameServerListener extends FloodProtectedListener
{
- private static List<GameServerThread> _gameServers = new FastList<>();
+ private static List<GameServerThread> _gameServers = new ArrayList<>();
public GameServerListener() throws IOException
{
Index: java/com/l2jserver/gameserver/instancemanager/RaidBossPointsManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/RaidBossPointsManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/RaidBossPointsManager.java (working copy)
@@ -26,13 +26,12 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
+import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -44,7 +43,7 @@
{
private static final Logger _log = Logger.getLogger(RaidBossPointsManager.class.getName());
- private FastMap<Integer, Map<Integer, Integer>> _list;
+ private HashMap<Integer, Map<Integer, Integer>> _list;
private final Comparator<Map.Entry<Integer, Integer>> _comparator = new Comparator<Map.Entry<Integer, Integer>>()
{
@@ -62,7 +61,7 @@
private final void init()
{
- _list = new FastMap<>();
+ _list = new HashMap<>();
try (Connection con = L2DatabaseFactory.getInstance().getConnection();
Statement s = con.createStatement();
ResultSet rs = s.executeQuery("SELECT `charId`,`boss_id`,`points` FROM `character_raid_points`"))
@@ -75,7 +74,7 @@
Map<Integer, Integer> values = _list.get(charId);
if (values == null)
{
- values = new FastMap<>();
+ values = new HashMap<>();
}
values.put(bossId, points);
_list.put(charId, values);
@@ -110,7 +109,7 @@
Map<Integer, Integer> tmpPoint = _list.get(ownerId);
if (tmpPoint == null)
{
- tmpPoint = new FastMap<>();
+ tmpPoint = new HashMap<>();
tmpPoint.put(bossId, points);
updatePointsInDB(player, bossId, points);
}
@@ -173,8 +172,8 @@
public Map<Integer, Integer> getRankList()
{
- Map<Integer, Integer> tmpRanking = new FastMap<>();
- Map<Integer, Integer> tmpPoints = new FastMap<>();
+ Map<Integer, Integer> tmpRanking = new HashMap<>();
+ Map<Integer, Integer> tmpPoints = new HashMap<>();
for (int ownerId : _list.keySet())
{
Index: java/com/l2jserver/gameserver/SevenSigns.java
===================================================================
--- java/com/l2jserver/gameserver/SevenSigns.java (revision 6473)
+++ java/com/l2jserver/gameserver/SevenSigns.java (working copy)
@@ -24,6 +24,7 @@
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Calendar;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -30,8 +31,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.instancemanager.CastleManager;
@@ -156,10 +155,10 @@
protected SevenSigns()
{
- _signsPlayerData = new FastMap<>();
- _signsSealOwners = new FastMap<>();
- _signsDuskSealTotals = new FastMap<>();
- _signsDawnSealTotals = new FastMap<>();
+ _signsPlayerData = new HashMap<>();
+ _signsSealOwners = new HashMap<>();
+ _signsDuskSealTotals = new HashMap<>();
+ _signsDawnSealTotals = new HashMap<>();
try
{
Index: java/com/l2jserver/gameserver/model/entity/Auction.java
===================================================================
--- java/com/l2jserver/gameserver/model/entity/Auction.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/entity/Auction.java (working copy)
@@ -25,12 +25,11 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Calendar;
+import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.ClanTable;
@@ -62,7 +61,7 @@
private long _currentBid = 0;
private long _startingBid = 0;
- private final Map<Integer, Bidder> _bidders = new FastMap<>();
+ private final Map<Integer, Bidder> _bidders = new HashMap<>();
private static final String[] ItemTypeName =
{
Index: java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java
===================================================================
--- java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java (working copy)
@@ -19,15 +19,15 @@
package com.l2jserver.gameserver.communitybbs.Manager;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.GameServer;
import com.l2jserver.gameserver.datatables.ClassListData;
@@ -50,8 +50,8 @@
private int _onlineCount = 0;
private int _onlineCountGm = 0;
- private static Map<Integer, List<L2PcInstance>> _onlinePlayers = new FastMap<Integer, List<L2PcInstance>>().shared();
- private static Map<Integer, Map<String, String>> _communityPages = new FastMap<Integer, Map<String, String>>().shared();
+ private static Map<Integer, List<L2PcInstance>> _onlinePlayers = new ConcurrentHashMap<>();
+ private static Map<Integer, Map<String, String>> _communityPages = new ConcurrentHashMap<>();
@Override
public void parsecmd(String command, L2PcInstance activeChar)
@@ -344,7 +344,7 @@
for (int page : _onlinePlayers.keySet())
{
- Map<String, String> communityPage = new FastMap<>();
+ Map<String, String> communityPage = new HashMap<>();
htmlCode.setLength(0);
StringUtil.append(htmlCode, "<html><body><br><table>" + trOpen + "<td align=left valign=top>Server Restarted: ", String.valueOf(GameServer.dateTimeServerStarted.getTime()), tdClose + trClose + "</table><table>" + trOpen + tdOpen + "XP Rate: x", String.valueOf(Config.RATE_XP), tdClose + colSpacer + tdOpen + "Party XP Rate: x", String.valueOf(Config.RATE_XP * Config.RATE_PARTY_XP), tdClose + colSpacer + tdOpen + "XP Exponent: ", String.valueOf(Config.ALT_GAME_EXPONENT_XP), tdClose + trClose + trOpen + tdOpen + "SP Rate: x", String.valueOf(Config.RATE_SP), tdClose + colSpacer + tdOpen + "Party SP Rate: x", String.valueOf(Config.RATE_SP * Config.RATE_PARTY_SP), tdClose + colSpacer + tdOpen + "SP Exponent: ", String.valueOf(Config.ALT_GAME_EXPONENT_SP), tdClose + trClose + trOpen + tdOpen + "Drop Rate: ", String.valueOf(Config.RATE_DEATH_DROP_CHANCE_MULTIPLIER), tdClose + colSpacer + tdOpen + "Spoil Rate: ", String.valueOf(Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER), tdClose + colSpacer + tdOpen + "Adena Rate: ", String.valueOf(Config.RATE_DROP_AMOUNT_MULTIPLIER.containsKey(Inventory.ADENA_ID) ? Config.RATE_DROP_AMOUNT_MULTIPLIER.get(Inventory.ADENA_ID) : 1), tdClose + trClose + "</table><table>" + trOpen + "<td><img src=\"sek.cbui355\" width=600 height=1><br></td>" + trClose + trOpen + tdOpen, String.valueOf(L2World.getInstance().getVisibleObjectsCount()), " Object count</td>" + trClose + trOpen + tdOpen, String.valueOf(getOnlineCount("gm")), " Player(s) Online</td>" + trClose + "</table>");
Index: java/com/l2jserver/gameserver/model/entity/ClanHall.java
===================================================================
--- java/com/l2jserver/gameserver/model/entity/ClanHall.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/entity/ClanHall.java (working copy)
@@ -22,12 +22,11 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.ClanTable;
@@ -214,7 +213,7 @@
_ownerId = set.getInt("ownerId");
_desc = set.getString("desc");
_location = set.getString("location");
- _functions = new FastMap<>();
+ _functions = new HashMap<>();
if (_ownerId > 0)
{
Index: java/com/l2jserver/gameserver/model/MobGroupTable.java
===================================================================
--- java/com/l2jserver/gameserver/model/MobGroupTable.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/MobGroupTable.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.model;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.model.actor.instance.L2ControllableMobInstance;
/**
@@ -36,7 +35,7 @@
protected MobGroupTable()
{
- _groupMap = new FastMap<>();
+ _groupMap = new HashMap<>();
}
public static MobGroupTable getInstance()
Index: java/com/l2jserver/gameserver/model/entity/Instance.java
===================================================================
--- java/com/l2jserver/gameserver/model/entity/Instance.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/entity/Instance.java (working copy)
@@ -31,8 +31,6 @@
import javax.xml.parsers.DocumentBuilderFactory;
-import javolution.util.FastMap;
-
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -96,7 +94,7 @@
private String _timerText = "";
protected ScheduledFuture<?> _checkTimeUpTask = null;
- protected final Map<Integer, ScheduledFuture<?>> _ejectDeadTasks = new FastMap<>();
+ protected final Map<Integer, ScheduledFuture<?>> _ejectDeadTasks = new HashMap<>();
public Instance(int id)
{
Index: java/com/l2jserver/gameserver/model/items/L2Item.java
===================================================================
--- java/com/l2jserver/gameserver/model/items/L2Item.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/items/L2Item.java (working copy)
@@ -847,7 +847,7 @@
* Returns effects of skills associated with the item.
* @param caster : L2Character pointing out the caster
* @param target : L2Character pointing out the target
- * @return L2Effect[] : array of effects generated by the skill public L2Effect[] getSkillEffects(L2Character caster, L2Character target) { if (_skills == null) return _emptyEffectSet; List<L2Effect> effects = new FastList<L2Effect>(); for (L2Skill skill : _skills) { if
+ * @return L2Effect[] : array of effects generated by the skill public L2Effect[] getSkillEffects(L2Character caster, L2Character target) { if (_skills == null) return _emptyEffectSet; List<L2Effect> effects = new ArrayList<L2Effect>(); for (L2Skill skill : _skills) { if
* (!skill.checkCondition(caster, target, true)) continue; // Skill condition not met if (target.getFirstEffect(skill.getId()) != null) target.removeEffect(target.getFirstEffect(skill.getId())); for (L2Effect e : skill.getEffects(caster, target)) effects.add(e); } if (effects.isEmpty())
* return _emptyEffectSet; return effects.toArray(new L2Effect[effects.size()]); }
*/
Index: java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java (working copy)
@@ -20,11 +20,10 @@
import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Future;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.datatables.SkillData;
@@ -206,7 +205,7 @@
{
if (_beastSkills == null)
{
- _beastSkills = new FastList<>();
+ _beastSkills = new ArrayList<>();
}
_beastSkills.add(skill);
}
Index: java/com/l2jserver/gameserver/model/actor/status/CharStatus.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/status/CharStatus.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/actor/status/CharStatus.java (working copy)
@@ -19,12 +19,11 @@
package com.l2jserver.gameserver.model.actor.status;
import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastSet;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.model.actor.L2Character;
@@ -109,7 +108,7 @@
{
if (_StatusListener == null)
{
- _StatusListener = new FastSet<L2Character>().shared();
+ _StatusListener = new CopyOnWriteArraySet<>();
}
return _StatusListener;
}
Index: java/com/l2jserver/gameserver/model/L2SiegeClan.java
===================================================================
--- java/com/l2jserver/gameserver/model/L2SiegeClan.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/L2SiegeClan.java (working copy)
@@ -18,16 +18,15 @@
*/
package com.l2jserver.gameserver.model;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
public class L2SiegeClan
{
private int _clanId = 0;
- private List<L2Npc> _flag = new FastList<>();
+ private List<L2Npc> _flag = new ArrayList<>();
private int _numFlagsAdded = 0;
private SiegeClanType _type;
@@ -95,7 +94,7 @@
{
if (_flag == null)
{
- _flag = new FastList<>();
+ _flag = new ArrayList<>();
}
return _flag;
}
Index: java/com/l2jserver/gameserver/datatables/SpawnTable.java
===================================================================
--- java/com/l2jserver/gameserver/datatables/SpawnTable.java (revision 6473)
+++ java/com/l2jserver/gameserver/datatables/SpawnTable.java (working copy)
@@ -26,12 +26,11 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-import javolution.util.FastSet;
-
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -56,7 +55,7 @@
private static final String SELECT_SPAWNS = "SELECT count, npc_templateid, locx, locy, locz, heading, respawn_delay, respawn_random, loc_id, periodOfDay FROM spawnlist";
private static final String SELECT_CUSTOM_SPAWNS = "SELECT count, npc_templateid, locx, locy, locz, heading, respawn_delay, respawn_random, loc_id, periodOfDay FROM custom_spawnlist";
- private static final Map<Integer, Set<L2Spawn>> _spawnTable = new FastMap<Integer, Set<L2Spawn>>().shared();
+ private static final Map<Integer, Set<L2Spawn>> _spawnTable = new ConcurrentHashMap<>();
private int _xmlSpawnCount = 0;
@@ -466,7 +465,7 @@
{
if (!_spawnTable.containsKey(spawn.getId()))
{
- _spawnTable.put(spawn.getId(), new FastSet<L2Spawn>().shared());
+ _spawnTable.put(spawn.getId(), new CopyOnWriteArraySet<L2Spawn>());
}
_spawnTable.get(spawn.getId()).add(spawn);
}
Index: java/com/l2jserver/gameserver/ai/L2CharacterAI.java
===================================================================
--- java/com/l2jserver/gameserver/ai/L2CharacterAI.java (revision 6473)
+++ java/com/l2jserver/gameserver/ai/L2CharacterAI.java (working copy)
@@ -28,10 +28,9 @@
import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_PICK_UP;
import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_REST;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.GeoData;
@@ -1212,19 +1211,19 @@
public boolean isHealer = false;
public boolean isFighter = false;
public boolean cannotMoveOnLand = false;
- public List<Skill> generalSkills = new FastList<>();
- public List<Skill> buffSkills = new FastList<>();
+ public List<Skill> generalSkills = new ArrayList<>();
+ public List<Skill> buffSkills = new ArrayList<>();
public int lastBuffTick = 0;
- public List<Skill> debuffSkills = new FastList<>();
+ public List<Skill> debuffSkills = new ArrayList<>();
public int lastDebuffTick = 0;
- public List<Skill> cancelSkills = new FastList<>();
- public List<Skill> healSkills = new FastList<>();
- // public List<L2Skill> trickSkills = new FastList<>();
- public List<Skill> generalDisablers = new FastList<>();
- public List<Skill> sleepSkills = new FastList<>();
- public List<Skill> rootSkills = new FastList<>();
- public List<Skill> muteSkills = new FastList<>();
- public List<Skill> resurrectSkills = new FastList<>();
+ public List<Skill> cancelSkills = new ArrayList<>();
+ public List<Skill> healSkills = new ArrayList<>();
+ // public List<L2Skill> trickSkills = new ArrayList<>();
+ public List<Skill> generalDisablers = new ArrayList<>();
+ public List<Skill> sleepSkills = new ArrayList<>();
+ public List<Skill> rootSkills = new ArrayList<>();
+ public List<Skill> muteSkills = new ArrayList<>();
+ public List<Skill> resurrectSkills = new ArrayList<>();
public boolean hasHealOrResurrect = false;
public boolean hasLongRangeSkills = false;
public boolean hasLongRangeDamageSkills = false;
Index: java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java
===================================================================
--- java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java (working copy)
@@ -19,12 +19,11 @@
package com.l2jserver.gameserver.network.clientpackets;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.datatables.SecondaryAuthData;
@@ -51,7 +50,7 @@
{
private static final String _C__12_CHARACTERSELECT = "[C] 12 CharacterSelect";
protected static final Logger _logAccounting = Logger.getLogger("accounting");
- private static final List<PlayerListener> _listeners = new FastList<PlayerListener>().shared();
+ private static final List<PlayerListener> _listeners = new CopyOnWriteArrayList<>();
// cd
private int _charSlot;
Index: java/com/l2jserver/gameserver/network/serverpackets/ConfirmDlg.java
===================================================================
--- java/com/l2jserver/gameserver/network/serverpackets/ConfirmDlg.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/serverpackets/ConfirmDlg.java (working copy)
@@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
-import javolution.util.FastList;
+import java.util.ArrayList;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -48,7 +48,7 @@
private static final int TYPE_NUMBER = 1;
private static final int TYPE_TEXT = 0;
- private final FastList<CnfDlgData> _info = new FastList<>();
+ private final ArrayList<CnfDlgData> _info = new ArrayList<>();
private int _time = 0;
private int _requesterId = 0;
Index: java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java (working copy)
@@ -21,12 +21,11 @@
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.model.L2Spawn;
@@ -39,7 +38,7 @@
private static Logger _log = Logger.getLogger(SiegeGuardManager.class.getName());
private final Castle _castle;
- private final List<L2Spawn> _siegeGuardSpawn = new FastList<>();
+ private final List<L2Spawn> _siegeGuardSpawn = new ArrayList<>();
public SiegeGuardManager(Castle castle)
{
Index: java/com/l2jserver/gameserver/model/actor/L2Character.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/L2Character.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/actor/L2Character.java (working copy)
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -32,10 +33,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-import javolution.util.WeakFastSet;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.GeoData;
@@ -203,7 +200,7 @@
/** Table of Calculators containing all used calculator */
private Calculator[] _calculators;
/** Map containing all skills of this character. */
- private final Map<Integer, Skill> _skills = new FastMap<Integer, Skill>().shared();
+ private final Map<Integer, Skill> _skills = new ConcurrentHashMap<>();
/** Map containing the skill reuse time stamps. */
private volatile Map<Integer, TimeStamp> _reuseTimeStampsSkills = null;
/** Map containing the item reuse time stamps. */
@@ -2715,7 +2712,7 @@
{
if (_attackByList == null)
{
- _attackByList = new WeakFastSet<>(true);
+ _attackByList = new HashSet<>();
}
}
}
@@ -5653,7 +5650,7 @@
int _skiprange = 0;
int _skipgeo = 0;
int _skippeace = 0;
- List<L2Character> targetList = new FastList<>(targets.length);
+ List<L2Character> targetList = new ArrayList<>(targets.length);
for (L2Object target : targets)
{
if (target instanceof L2Character)
Index: java/com/l2jserver/gameserver/model/L2CommandChannel.java
===================================================================
--- java/com/l2jserver/gameserver/model/L2CommandChannel.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/L2CommandChannel.java (working copy)
@@ -19,9 +19,8 @@
package com.l2jserver.gameserver.model;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -50,7 +49,7 @@
{
_commandLeader = leader;
L2Party party = leader.getParty();
- _parties = new FastList<L2Party>().shared();
+ _parties = new CopyOnWriteArrayList<>();
_parties.add(party);
_channelLvl = party.getLevel();
party.setCommandChannel(this);
@@ -164,7 +163,7 @@
@Override
public List<L2PcInstance> getMembers()
{
- List<L2PcInstance> members = new FastList<L2PcInstance>().shared();
+ List<L2PcInstance> members = new CopyOnWriteArrayList<>();
for (L2Party party : getPartys())
{
members.addAll(party.getMembers());
Index: java/com/l2jserver/gameserver/model/L2Radar.java
===================================================================
--- java/com/l2jserver/gameserver/model/L2Radar.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/L2Radar.java (working copy)
@@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.model;
-import javolution.util.FastList;
+import java.util.ArrayList;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.RadarControl;
@@ -29,12 +29,12 @@
public final class L2Radar
{
private final L2PcInstance _player;
- private final FastList<RadarMarker> _markers;
+ private final ArrayList<RadarMarker> _markers;
public L2Radar(L2PcInstance player)
{
_player = player;
- _markers = new FastList<>();
+ _markers = new ArrayList<>();
}
// Add a marker to player's radar
Index: java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java
===================================================================
--- java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java (working copy)
@@ -18,12 +18,11 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.datatables.RecipeData;
import com.l2jserver.gameserver.model.L2RecipeList;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -41,7 +40,7 @@
private L2PcInstance _activeChar;
private long _playerAdena;
- private List<L2WarehouseItem> _objects = new FastList<>();
+ private List<L2WarehouseItem> _objects = new ArrayList<>();
private int _whType;
private byte _sortorder;
private WarehouseListType _itemtype;
@@ -423,7 +422,7 @@
*/
private List<L2WarehouseItem> createWeaponList(L2ItemInstance[] _items)
{
- List<L2WarehouseItem> _list = new FastList<>();
+ List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if (item.isWeapon() || (item.getItem().getType2() == L2Item.TYPE2_WEAPON) || (item.isEtcItem() && (item.getItemType() == L2EtcItemType.ARROW)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@@ -448,7 +447,7 @@
*/
private List<L2WarehouseItem> createArmorList(L2ItemInstance[] _items)
{
- List<L2WarehouseItem> _list = new FastList<>();
+ List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if (item.isArmor() || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@@ -473,7 +472,7 @@
*/
private List<L2WarehouseItem> createEtcItemList(L2ItemInstance[] _items)
{
- List<L2WarehouseItem> _list = new FastList<>();
+ List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if (item.isEtcItem() || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@@ -498,7 +497,7 @@
*/
private List<L2WarehouseItem> createMatList(L2ItemInstance[] _items)
{
- List<L2WarehouseItem> _list = new FastList<>();
+ List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && (item.getEtcItem().getItemType() == L2EtcItemType.MATERIAL)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@@ -523,7 +522,7 @@
*/
private List<L2WarehouseItem> createRecipeList(L2ItemInstance[] _items)
{
- List<L2WarehouseItem> _list = new FastList<>();
+ List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && (item.getEtcItem().getItemType() == L2EtcItemType.RECIPE)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@@ -548,7 +547,7 @@
*/
private List<L2WarehouseItem> createAmulettList(L2ItemInstance[] _items)
{
- List<L2WarehouseItem> _list = new FastList<>();
+ List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && (item.getItemName().toUpperCase().startsWith("AMULET"))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@@ -573,7 +572,7 @@
*/
private List<L2WarehouseItem> createSpellbookList(L2ItemInstance[] _items)
{
- List<L2WarehouseItem> _list = new FastList<>();
+ List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && (!item.getItemName().toUpperCase().startsWith("AMULET"))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@@ -598,7 +597,7 @@
*/
private List<L2WarehouseItem> createConsumableList(L2ItemInstance[] _items)
{
- List<L2WarehouseItem> _list = new FastList<>();
+ List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && ((item.getEtcItem().getItemType() == L2EtcItemType.SCROLL) || (item.getEtcItem().getItemType() == L2EtcItemType.SHOT))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@@ -623,7 +622,7 @@
*/
private List<L2WarehouseItem> createShotList(L2ItemInstance[] _items)
{
- List<L2WarehouseItem> _list = new FastList<>();
+ List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && (item.getEtcItem().getItemType() == L2EtcItemType.SHOT)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@@ -648,7 +647,7 @@
*/
private List<L2WarehouseItem> createScrollList(L2ItemInstance[] _items)
{
- List<L2WarehouseItem> _list = new FastList<>();
+ List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && (item.getEtcItem().getItemType() == L2EtcItemType.SCROLL)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@@ -673,7 +672,7 @@
*/
private List<L2WarehouseItem> createSeedList(L2ItemInstance[] _items)
{
- List<L2WarehouseItem> _list = new FastList<>();
+ List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && (item.getEtcItem().getItemType() == L2EtcItemType.SEED)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@@ -698,7 +697,7 @@
*/
private List<L2WarehouseItem> createOtherList(L2ItemInstance[] _items)
{
- List<L2WarehouseItem> _list = new FastList<>();
+ List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && ((item.getEtcItem().getItemType() != L2EtcItemType.MATERIAL) && (item.getEtcItem().getItemType() != L2EtcItemType.RECIPE) && (item.getEtcItem().getItemType() != L2EtcItemType.SCROLL) && (item.getEtcItem().getItemType() != L2EtcItemType.SHOT))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@@ -723,7 +722,7 @@
*/
private List<L2WarehouseItem> createAllList(L2ItemInstance[] _items)
{
- List<L2WarehouseItem> _list = new FastList<>();
+ List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if (_list.size() < MAX_SORT_LIST_ITEMS)
Index: java/com/l2jserver/gameserver/model/BlockList.java
===================================================================
--- java/com/l2jserver/gameserver/model/BlockList.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/BlockList.java (working copy)
@@ -24,11 +24,10 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -42,7 +41,7 @@
public class BlockList
{
private static Logger _log = Logger.getLogger(BlockList.class.getName());
- private static Map<Integer, List<Integer>> _offlineList = new FastMap<Integer, List<Integer>>().shared();
+ private static Map<Integer, List<Integer>> _offlineList = new ConcurrentHashMap<>();
private final L2PcInstance _owner;
private List<Integer> _blockList;
Index: java/com/l2jserver/gameserver/communitybbs/BB/Forum.java
===================================================================
--- java/com/l2jserver/gameserver/communitybbs/BB/Forum.java (revision 6473)
+++ java/com/l2jserver/gameserver/communitybbs/BB/Forum.java (working copy)
@@ -21,14 +21,13 @@
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.communitybbs.Manager.ForumsBBSManager;
import com.l2jserver.gameserver.communitybbs.Manager.TopicBBSManager;
@@ -68,8 +67,8 @@
{
_forumId = Forumid;
_fParent = FParent;
- _children = new FastList<>();
- _topic = new FastMap<>();
+ _children = new ArrayList<>();
+ _topic = new HashMap<>();
}
/**
@@ -88,8 +87,8 @@
_forumPerm = perm;
_fParent = parent;
_ownerID = OwnerID;
- _children = new FastList<>();
- _topic = new FastMap<>();
+ _children = new ArrayList<>();
+ _topic = new HashMap<>();
parent._children.add(this);
ForumsBBSManager.getInstance().addForum(this);
_loaded = true;
Index: java/com/l2jserver/loginserver/GameServerThread.java
===================================================================
--- java/com/l2jserver/loginserver/GameServerThread.java (revision 6473)
+++ java/com/l2jserver/loginserver/GameServerThread.java (working copy)
@@ -26,11 +26,10 @@
import java.security.KeyPair;
import java.security.interfaces.RSAPrivateKey;
import java.security.interfaces.RSAPublicKey;
+import java.util.HashSet;
import java.util.Set;
import java.util.logging.Logger;
-import javolution.util.FastSet;
-
import com.l2jserver.Config;
import com.l2jserver.loginserver.GameServerTable.GameServerInfo;
import com.l2jserver.loginserver.network.L2JGameServerPacketHandler;
@@ -64,7 +63,7 @@
private GameServerInfo _gsi;
/** Authed Clients on a GameServer */
- private final Set<String> _accountsOnGameServer = new FastSet<>();
+ private final Set<String> _accountsOnGameServer = new HashSet<>();
private String _connectionIPAddress;
Index: java/com/l2jserver/gameserver/model/actor/L2Vehicle.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/L2Vehicle.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/actor/L2Vehicle.java (working copy)
@@ -18,13 +18,12 @@
*/
package com.l2jserver.gameserver.model.actor;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.logging.Level;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.ThreadPoolManager;
@@ -54,7 +53,7 @@
public abstract class L2Vehicle extends L2Character
{
protected int _dockId = 0;
- protected final FastList<L2PcInstance> _passengers = new FastList<>();
+ protected final ArrayList<L2PcInstance> _passengers = new ArrayList<>();
protected Location _oustLoc = null;
private Runnable _engine = null;
Index: java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java (working copy)
@@ -22,12 +22,11 @@
import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.enums.InstanceType;
import com.l2jserver.gameserver.instancemanager.AuctionManager;
@@ -47,7 +46,7 @@
private static final int COND_BUSY_BECAUSE_OF_SIEGE = 1;
private static final int COND_REGULAR = 3;
- private final Map<Integer, Auction> _pendingAuctions = new FastMap<>();
+ private final Map<Integer, Auction> _pendingAuctions = new HashMap<>();
public L2AuctioneerInstance(int objectId, L2NpcTemplate template)
{
Index: java/com/l2jserver/gameserver/instancemanager/FortSiegeGuardManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/FortSiegeGuardManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/FortSiegeGuardManager.java (working copy)
@@ -21,12 +21,11 @@
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.model.L2Spawn;
@@ -38,8 +37,8 @@
private static final Logger _log = Logger.getLogger(FortSiegeGuardManager.class.getName());
private final Fort _fort;
- private final FastMap<Integer, FastList<L2Spawn>> _siegeGuards = new FastMap<>();
- private FastList<L2Spawn> _siegeGuardsSpawns;
+ private final HashMap<Integer, ArrayList<L2Spawn>> _siegeGuards = new HashMap<>();
+ private ArrayList<L2Spawn> _siegeGuardsSpawns;
public FortSiegeGuardManager(Fort fort)
{
@@ -53,7 +52,7 @@
{
try
{
- final FastList<L2Spawn> monsterList = getSiegeGuardSpawn().get(getFort().getResidenceId());
+ final ArrayList<L2Spawn> monsterList = getSiegeGuardSpawn().get(getFort().getResidenceId());
if (monsterList != null)
{
for (L2Spawn spawnDat : monsterList)
@@ -83,7 +82,7 @@
{
try
{
- final FastList<L2Spawn> monsterList = getSiegeGuardSpawn().get(getFort().getResidenceId());
+ final ArrayList<L2Spawn> monsterList = getSiegeGuardSpawn().get(getFort().getResidenceId());
if (monsterList != null)
{
@@ -117,7 +116,7 @@
{
L2Spawn spawn1;
L2NpcTemplate template1;
- _siegeGuardsSpawns = new FastList<>();
+ _siegeGuardsSpawns = new ArrayList<>();
while (rs.next())
{
int fortId = rs.getInt("fortId");
@@ -154,7 +153,7 @@
return _fort;
}
- public final FastMap<Integer, FastList<L2Spawn>> getSiegeGuardSpawn()
+ public final HashMap<Integer, ArrayList<L2Spawn>> getSiegeGuardSpawn()
{
return _siegeGuards;
}
Index: java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java
===================================================================
--- java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java (revision 6473)
+++ java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java (working copy)
@@ -21,11 +21,10 @@
import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ACTIVE;
import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.MobGroup;
import com.l2jserver.gameserver.model.MobGroupTable;
@@ -444,7 +443,7 @@
double dy, dx;
double dblAggroRange = aggroRange * aggroRange;
- List<L2Character> potentialTarget = new FastList<>();
+ List<L2Character> potentialTarget = new ArrayList<>();
Collection<L2Object> objs = npc.getKnownList().getKnownObjects().values();
for (L2Object obj : objs)
Index: java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillList.java
===================================================================
--- java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillList.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillList.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
public class ExEnchantSkillList extends L2GameServerPacket
{
public enum EnchantSkillType
@@ -55,7 +54,7 @@
public ExEnchantSkillList(EnchantSkillType type)
{
_type = type;
- _skills = new FastList<>();
+ _skills = new ArrayList<>();
}
@Override
Index: java/com/l2jserver/gameserver/instancemanager/BoatManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/BoatManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/BoatManager.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.instancemanager;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.model.L2World;
@@ -35,7 +34,7 @@
public class BoatManager
{
- private final Map<Integer, L2BoatInstance> _boats = new FastMap<>();
+ private final Map<Integer, L2BoatInstance> _boats = new HashMap<>();
private final boolean[] _docksBusy = new boolean[3];
public static final int TALKING_ISLAND = 1;
Index: java/com/l2jserver/gameserver/datatables/AdminTable.java
===================================================================
--- java/com/l2jserver/gameserver/datatables/AdminTable.java (revision 6473)
+++ java/com/l2jserver/gameserver/datatables/AdminTable.java (working copy)
@@ -23,10 +23,9 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
-import javolution.util.FastMap;
-
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -46,7 +45,7 @@
{
private static final Map<Integer, L2AccessLevel> _accessLevels = new HashMap<>();
private static final Map<String, L2AdminCommandAccessRight> _adminCommandAccessRights = new HashMap<>();
- private static final Map<L2PcInstance, Boolean> _gmList = new FastMap<L2PcInstance, Boolean>().shared();
+ private static final Map<L2PcInstance, Boolean> _gmList = new ConcurrentHashMap<>();
private int _highestLevel = 0;
protected AdminTable()
Index: java/com/l2jserver/gameserver/model/entity/Siege.java
===================================================================
--- java/com/l2jserver/gameserver/model/entity/Siege.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/entity/Siege.java (working copy)
@@ -26,12 +26,11 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.Announcements;
@@ -73,7 +72,7 @@
{
protected static final Logger _log = Logger.getLogger(Siege.class.getName());
- private static final List<SiegeListener> siegeListeners = new FastList<SiegeListener>().shared();
+ private static final List<SiegeListener> siegeListeners = new CopyOnWriteArrayList<>();
// typeId's
public static final byte OWNER = -1;
@@ -224,9 +223,9 @@
}
// must support Concurrent Modifications
- private final List<L2SiegeClan> _attackerClans = new FastList<>();
- private final List<L2SiegeClan> _defenderClans = new FastList<>();
- private final List<L2SiegeClan> _defenderWaitingClans = new FastList<>();
+ private final List<L2SiegeClan> _attackerClans = new ArrayList<>();
+ private final List<L2SiegeClan> _defenderClans = new ArrayList<>();
+ private final List<L2SiegeClan> _defenderWaitingClans = new ArrayList<>();
// Castle setting
private final List<L2ControlTowerInstance> _controlTowers = new ArrayList<>();
Index: java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java (working copy)
@@ -21,13 +21,12 @@
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
@@ -1060,7 +1059,7 @@
int buff_index = 0;
- final List<Integer> storedSkills = new FastList<>();
+ final List<Integer> storedSkills = new ArrayList<>();
// Store all effect data along with calculated remaining
if (storeEffects)
@@ -1106,7 +1105,7 @@
if (!SummonEffectsTable.getInstance().getPetEffects().containsKey(getControlObjectId()))
{
- SummonEffectsTable.getInstance().getPetEffects().put(getControlObjectId(), new FastList<SummonEffect>());
+ SummonEffectsTable.getInstance().getPetEffects().put(getControlObjectId(), new ArrayList<SummonEffect>());
}
SummonEffectsTable.getInstance().getPetEffects().get(getControlObjectId()).add(SummonEffectsTable.getInstance().new SummonEffect(skill, info.getTime()));
@@ -1145,7 +1144,7 @@
{
if (!SummonEffectsTable.getInstance().getPetEffects().containsKey(getControlObjectId()))
{
- SummonEffectsTable.getInstance().getPetEffects().put(getControlObjectId(), new FastList<SummonEffect>());
+ SummonEffectsTable.getInstance().getPetEffects().put(getControlObjectId(), new ArrayList<SummonEffect>());
}
SummonEffectsTable.getInstance().getPetEffects().get(getControlObjectId()).add(SummonEffectsTable.getInstance().new SummonEffect(skill, effectCurTime));
Index: java/com/l2jserver/gameserver/model/quest/QuestState.java
===================================================================
--- java/com/l2jserver/gameserver/model/quest/QuestState.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/quest/QuestState.java (working copy)
@@ -221,8 +221,8 @@
* <ul>
* <li>Initialize class variable "vars" if is null.</li>
* <li>Initialize parameter "val" if is null</li>
- * <li>Add/Update couple (var,val) in class variable FastMap "vars"</li>
- * <li>If the key represented by "var" exists in FastMap "vars", the couple (var,val) is updated in the database.<br>
+ * <li>Add/Update couple (var,val) in class variable HashMap "vars"</li>
+ * <li>If the key represented by "var" exists in HashMap "vars", the couple (var,val) is updated in the database.<br>
* The key is known as existing if the preceding value of the key (given as result of function put()) is not null.<br>
* If the key doesn't exist, the couple is added/created in the database</li>
* <ul>
Index: java/com/l2jserver/gameserver/communitybbs/Manager/PostBBSManager.java
===================================================================
--- java/com/l2jserver/gameserver/communitybbs/Manager/PostBBSManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/communitybbs/Manager/PostBBSManager.java (working copy)
@@ -20,12 +20,11 @@
import java.text.DateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.StringTokenizer;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.communitybbs.BB.Forum;
import com.l2jserver.gameserver.communitybbs.BB.Post;
import com.l2jserver.gameserver.communitybbs.BB.Post.CPost;
@@ -36,7 +35,7 @@
public class PostBBSManager extends BaseBBSManager
{
- private final Map<Topic, Post> _postByTopic = new FastMap<>();
+ private final Map<Topic, Post> _postByTopic = new HashMap<>();
public Post getGPosttByTopic(Topic t)
{
Index: java/com/l2jserver/gameserver/model/Petition.java
===================================================================
--- java/com/l2jserver/gameserver/model/Petition.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/Petition.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.model;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.enums.PetitionState;
import com.l2jserver.gameserver.enums.PetitionType;
import com.l2jserver.gameserver.idfactory.IdFactory;
@@ -44,7 +43,7 @@
private final PetitionType _type;
private PetitionState _state = PetitionState.PENDING;
private final String _content;
- private final List<CreatureSay> _messageLog = new FastList<>();
+ private final List<CreatureSay> _messageLog = new ArrayList<>();
private final L2PcInstance _petitioner;
private L2PcInstance _responder;
Index: java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNodeBuffer.java
===================================================================
--- java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNodeBuffer.java (revision 6473)
+++ java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNodeBuffer.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.pathfinding.cellnodes;
+import java.util.ArrayList;
import java.util.concurrent.locks.ReentrantLock;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
/**
@@ -113,9 +112,9 @@
return _lastElapsedTime;
}
- public final FastList<CellNode> debugPath()
+ public final ArrayList<CellNode> debugPath()
{
- FastList<CellNode> result = new FastList<>();
+ ArrayList<CellNode> result = new ArrayList<>();
for (CellNode n = _current; n.getParent() != null; n = (CellNode) n.getParent())
{
Index: java/com/l2jserver/gameserver/instancemanager/CoupleManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/CoupleManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/CoupleManager.java (working copy)
@@ -21,11 +21,10 @@
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
+import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -38,7 +37,7 @@
{
private static final Logger _log = Logger.getLogger(CoupleManager.class.getName());
- private FastList<Couple> _couples;
+ private ArrayList<Couple> _couples;
protected CoupleManager()
{
@@ -139,11 +138,11 @@
return -1;
}
- public final FastList<Couple> getCouples()
+ public final ArrayList<Couple> getCouples()
{
if (_couples == null)
{
- _couples = new FastList<>();
+ _couples = new ArrayList<>();
}
return _couples;
}
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
===================================================================
--- java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponLocation.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponLocation.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
import com.l2jserver.gameserver.model.CursedWeapon;
import com.l2jserver.gameserver.model.Location;
@@ -52,7 +51,7 @@
return;
}
- List<CursedWeaponInfo> list = new FastList<>();
+ List<CursedWeaponInfo> list = new ArrayList<>();
for (CursedWeapon cw : CursedWeaponsManager.getInstance().getCursedWeapons())
{
if (!cw.isActive())
Index: java/com/l2jserver/gameserver/geoeditorcon/GeoEditorThread.java
===================================================================
--- java/com/l2jserver/gameserver/geoeditorcon/GeoEditorThread.java (revision 6473)
+++ java/com/l2jserver/gameserver/geoeditorcon/GeoEditorThread.java (working copy)
@@ -21,11 +21,10 @@
import java.io.IOException;
import java.io.OutputStream;
import java.net.Socket;
+import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
@@ -46,13 +45,13 @@
private OutputStream _out;
- private final FastList<L2PcInstance> _gms;
+ private final ArrayList<L2PcInstance> _gms;
public GeoEditorThread(Socket ge)
{
_geSocket = ge;
_working = true;
- _gms = new FastList<>();
+ _gms = new ArrayList<>();
}
@Override
Index: java/com/l2jserver/gameserver/instancemanager/AntiFeedManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/AntiFeedManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/AntiFeedManager.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.instancemanager;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -123,7 +122,7 @@
{
if (!_eventIPs.containsKey(eventId))
{
- _eventIPs.put(eventId, new FastMap<Integer, Connections>());
+ _eventIPs.put(eventId, new HashMap<Integer, Connections>());
}
}
Index: java/com/l2jserver/gameserver/script/ScriptPackage.java
===================================================================
--- java/com/l2jserver/gameserver/script/ScriptPackage.java (revision 6473)
+++ java/com/l2jserver/gameserver/script/ScriptPackage.java (working copy)
@@ -19,6 +19,7 @@
package com.l2jserver.gameserver.script;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.logging.Logger;
@@ -25,8 +26,6 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
/**
@@ -42,8 +41,8 @@
public ScriptPackage(ZipFile pack)
{
- _scriptFiles = new FastList<>();
- _otherFiles = new FastList<>();
+ _scriptFiles = new ArrayList<>();
+ _otherFiles = new ArrayList<>();
_name = pack.getName();
addFiles(pack);
}
Index: java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java (working copy)
@@ -18,13 +18,12 @@
*/
package com.l2jserver.gameserver.model.actor.instance;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
import java.util.concurrent.Future;
import java.util.logging.Level;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.L2CharacterAI;
import com.l2jserver.gameserver.ai.L2DoorAI;
@@ -618,7 +617,7 @@
public Collection<L2DefenderInstance> getKnownDefenders()
{
- FastList<L2DefenderInstance> result = new FastList<>();
+ ArrayList<L2DefenderInstance> result = new ArrayList<>();
Collection<L2Object> objs = getKnownList().getKnownObjects().values();
for (L2Object obj : objs)
Index: java/com/l2jserver/gameserver/model/PartyMatchRoomList.java
===================================================================
--- java/com/l2jserver/gameserver/model/PartyMatchRoomList.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/PartyMatchRoomList.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.model;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExClosePartyRoom;
@@ -36,7 +35,7 @@
protected PartyMatchRoomList()
{
- _rooms = new FastMap<>();
+ _rooms = new HashMap<>();
}
public synchronized void addPartyMatchRoom(int id, PartyMatchRoom room)
Index: java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java
===================================================================
--- java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java (working copy)
@@ -19,9 +19,8 @@
package com.l2jserver.gameserver.network.clientpackets;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.network.serverpackets.CharSelectionInfo;
import com.l2jserver.gameserver.scripting.scriptengine.events.PlayerEvent;
import com.l2jserver.gameserver.scripting.scriptengine.listeners.player.PlayerListener;
@@ -33,7 +32,7 @@
public final class CharacterRestore extends L2GameClientPacket
{
private static final String _C__7B_CHARACTERRESTORE = "[C] 7B CharacterRestore";
- private static final List<PlayerListener> _listeners = new FastList<PlayerListener>().shared();
+ private static final List<PlayerListener> _listeners = new CopyOnWriteArrayList<>();
// cd
private int _charSlot;
Index: java/com/l2jserver/gameserver/model/L2World.java
===================================================================
--- java/com/l2jserver/gameserver/model/L2World.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/L2World.java (working copy)
@@ -420,10 +420,10 @@
return null;
}
- // Create an FastList in order to contain all visible L2Object
+ // Create an ArrayList in order to contain all visible L2Object
List<L2Object> result = new ArrayList<>();
- // Go through the FastList of region
+ // Go through the ArrayList of region
for (L2WorldRegion regi : reg.getSurroundingRegions())
{
// Go through visible objects of the selected region
@@ -462,10 +462,10 @@
final int sqRadius = radius * radius;
- // Create an FastList in order to contain all visible L2Object
+ // Create an ArrayList in order to contain all visible L2Object
List<L2Object> result = new ArrayList<>();
- // Go through the FastList of region
+ // Go through the ArrayList of region
for (L2WorldRegion regi : object.getWorldRegion().getSurroundingRegions())
{
// Go through visible objects of the selected region
@@ -503,7 +503,7 @@
final int sqRadius = radius * radius;
- // Create an FastList in order to contain all visible L2Object
+ // Create an ArrayList in order to contain all visible L2Object
List<L2Object> result = new ArrayList<>();
// Go through visible object of the selected region
@@ -541,10 +541,10 @@
return null;
}
- // Create an FastList in order to contain all visible L2Object
+ // Create an ArrayList in order to contain all visible L2Object
List<L2Playable> result = new ArrayList<>();
- // Go through the FastList of region
+ // Go through the ArrayList of region
for (L2WorldRegion regi : reg.getSurroundingRegions())
{
// Create an Iterator to go through the visible L2Object of the L2WorldRegion
Index: java/com/l2jserver/gameserver/datatables/SkillTreesData.java
===================================================================
--- java/com/l2jserver/gameserver/datatables/SkillTreesData.java (revision 6473)
+++ java/com/l2jserver/gameserver/datatables/SkillTreesData.java (working copy)
@@ -72,7 +72,7 @@
*/
public final class SkillTreesData extends DocumentParser
{
- // ClassId, FastMap of Skill Hash Code, L2SkillLearn
+ // ClassId, HashMap of Skill Hash Code, L2SkillLearn
private static final Map<ClassId, Map<Integer, L2SkillLearn>> _classSkillTrees = new HashMap<>();
private static final Map<ClassId, Map<Integer, L2SkillLearn>> _transferSkillTrees = new HashMap<>();
// Skill Hash Code, L2SkillLearn
Index: java/com/l2jserver/gameserver/model/entity/L2Event.java
===================================================================
--- java/com/l2jserver/gameserver/model/entity/L2Event.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/entity/L2Event.java (working copy)
@@ -32,9 +32,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.cache.HtmCache;
import com.l2jserver.gameserver.datatables.NpcData;
@@ -64,12 +61,12 @@
public static String _eventCreator = "";
public static String _eventInfo = "";
public static int _teamsNumber = 0;
- public static final Map<Integer, String> _teamNames = new FastMap<>();
- public static final List<L2PcInstance> _registeredPlayers = new FastList<>();
- public static final Map<Integer, List<L2PcInstance>> _teams = new FastMap<>();
+ public static final Map<Integer, String> _teamNames = new HashMap<>();
+ public static final List<L2PcInstance> _registeredPlayers = new ArrayList<>();
+ public static final Map<Integer, List<L2PcInstance>> _teams = new HashMap<>();
public static int _npcId = 0;
- // public static final List<L2Npc> _npcs = new FastList<L2Npc>();
- private static final Map<L2PcInstance, PlayerEventHolder> _connectionLossData = new FastMap<>();
+ // public static final List<L2Npc> _npcs = new ArrayList<L2Npc>();
+ private static final Map<L2PcInstance, PlayerEventHolder> _connectionLossData = new HashMap<>();
public enum EventState
{
@@ -393,7 +390,7 @@
_eventInfo = br.readLine();
}
- List<L2PcInstance> temp = new FastList<>();
+ List<L2PcInstance> temp = new ArrayList<>();
for (L2PcInstance player : L2World.getInstance().getPlayers())
{
if (!player.isOnline())
@@ -451,7 +448,7 @@
// Insert empty lists at _teams.
for (int i = 0; i < _teamsNumber; i++)
{
- _teams.put(i + 1, new FastList<L2PcInstance>());
+ _teams.put(i + 1, new ArrayList<L2PcInstance>());
}
int i = 0;
Index: java/com/l2jserver/gameserver/model/StatsSet.java
===================================================================
--- java/com/l2jserver/gameserver/model/StatsSet.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/StatsSet.java (working copy)
@@ -20,13 +20,12 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.interfaces.IParserAdvUtils;
@@ -45,7 +44,7 @@
public StatsSet()
{
- this(new FastMap<String, Object>());
+ this(new HashMap<String, Object>());
}
public StatsSet(Map<String, Object> map)
Index: java/com/l2jserver/gameserver/model/entity/TvTEventTeam.java
===================================================================
--- java/com/l2jserver/gameserver/model/entity/TvTEventTeam.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/entity/TvTEventTeam.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.model.entity;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
@@ -35,8 +34,8 @@
private int[] _coordinates = new int[3];
/** The points of the team<br> */
private short _points;
- /** Name and instance of all participated players in FastMap<br> */
- private Map<Integer, L2PcInstance> _participatedPlayers = new FastMap<>();
+ /** Name and instance of all participated players in HashMap<br> */
+ private Map<Integer, L2PcInstance> _participatedPlayers = new HashMap<>();
/**
* C'tor initialize the team<br>
@@ -98,7 +97,7 @@
public void cleanMe()
{
_participatedPlayers.clear();
- _participatedPlayers = new FastMap<>();
+ _participatedPlayers = new HashMap<>();
_points = 0;
}
@@ -150,7 +149,7 @@
}
/**
- * Returns name and instance of all participated players in FastMap<br>
+ * Returns name and instance of all participated players in HashMap<br>
* <br>
* @return Map<String, L2PcInstance>: map of players in this team<br>
*/
Index: java/com/l2jserver/gameserver/taskmanager/KnownListUpdateTaskManager.java
===================================================================
--- java/com/l2jserver/gameserver/taskmanager/KnownListUpdateTaskManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/taskmanager/KnownListUpdateTaskManager.java (working copy)
@@ -19,11 +19,10 @@
package com.l2jserver.gameserver.taskmanager;
import java.util.Collection;
+import java.util.HashSet;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastSet;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.model.L2Object;
@@ -44,7 +43,7 @@
// Do full update every FULL_UPDATE_TIMER * KNOWNLIST_UPDATE_INTERVAL
public static int _fullUpdateTimer = FULL_UPDATE_TIMER;
- protected static final FastSet<L2WorldRegion> _failedRegions = new FastSet<>(1);
+ protected static final HashSet<L2WorldRegion> _failedRegions = new HashSet<>(1);
protected KnownListUpdateTaskManager()
{
Index: java/com/l2jserver/gameserver/model/MobGroup.java
===================================================================
--- java/com/l2jserver/gameserver/model/MobGroup.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/MobGroup.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.model;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.ai.L2ControllableMobAI;
import com.l2jserver.gameserver.datatables.SpawnTable;
@@ -68,7 +67,7 @@
{
if (_mobs == null)
{
- _mobs = new FastList<>();
+ _mobs = new ArrayList<>();
}
return _mobs;
@@ -370,7 +369,7 @@
protected void removeDead()
{
- List<L2ControllableMobInstance> deadMobs = new FastList<>();
+ List<L2ControllableMobInstance> deadMobs = new ArrayList<>();
for (L2ControllableMobInstance mobInst : getMobs())
{
Index: java/com/l2jserver/gameserver/network/serverpackets/FriendListExtended.java
===================================================================
--- java/com/l2jserver/gameserver/network/serverpackets/FriendListExtended.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/serverpackets/FriendListExtended.java (working copy)
@@ -21,10 +21,9 @@
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.datatables.CharNameTable;
import com.l2jserver.gameserver.model.L2World;
@@ -59,7 +58,7 @@
public FriendListExtended(L2PcInstance player)
{
- _info = new FastList<>(player.getFriendList().size());
+ _info = new ArrayList<>(player.getFriendList().size());
for (int objId : player.getFriendList())
{
String name = CharNameTable.getInstance().getNameById(objId);
Index: java/com/l2jserver/gameserver/network/serverpackets/BuyListSeed.java
===================================================================
--- java/com/l2jserver/gameserver/network/serverpackets/BuyListSeed.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/serverpackets/BuyListSeed.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.gameserver.model.SeedProduction;
/**
@@ -41,7 +40,7 @@
if ((seeds != null) && (seeds.size() > 0))
{
- _list = new FastList<>();
+ _list = new ArrayList<>();
for (SeedProduction s : seeds)
{
if ((s.getCanProduce() > 0) && (s.getPrice() > 0))
Index: java/com/l2jserver/gameserver/engines/DocumentEngine.java
===================================================================
--- java/com/l2jserver/gameserver/engines/DocumentEngine.java (revision 6473)
+++ java/com/l2jserver/gameserver/engines/DocumentEngine.java (working copy)
@@ -19,12 +19,11 @@
package com.l2jserver.gameserver.engines;
import java.io.File;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.engines.items.DocumentItem;
@@ -40,8 +39,8 @@
{
private static final Logger _log = Logger.getLogger(DocumentEngine.class.getName());
- private final List<File> _itemFiles = new FastList<>();
- private final List<File> _skillFiles = new FastList<>();
+ private final List<File> _itemFiles = new ArrayList<>();
+ private final List<File> _skillFiles = new ArrayList<>();
public static DocumentEngine getInstance()
{
@@ -114,7 +113,7 @@
*/
public List<L2Item> loadItems()
{
- List<L2Item> list = new FastList<>();
+ List<L2Item> list = new ArrayList<>();
for (File f : _itemFiles)
{
DocumentItem document = new DocumentItem(f);
Index: java/com/l2jserver/gameserver/ItemsAutoDestroy.java
===================================================================
--- java/com/l2jserver/gameserver/ItemsAutoDestroy.java (revision 6473)
+++ java/com/l2jserver/gameserver/ItemsAutoDestroy.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.enums.ItemLocation;
import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager;
@@ -35,7 +34,7 @@
protected ItemsAutoDestroy()
{
- _items = new FastList<>();
+ _items = new ArrayList<>();
_sleep = Config.AUTODESTROY_ITEM_AFTER * 1000;
if (_sleep == 0)
{
Index: java/com/l2jserver/gameserver/SevenSignsFestival.java
===================================================================
--- java/com/l2jserver/gameserver/SevenSignsFestival.java (revision 6473)
+++ java/com/l2jserver/gameserver/SevenSignsFestival.java (working copy)
@@ -24,6 +24,7 @@
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ScheduledFuture;
@@ -30,9 +31,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -793,17 +791,17 @@
protected SevenSignsFestival()
{
- _accumulatedBonuses = new FastList<>();
+ _accumulatedBonuses = new ArrayList<>();
- _dawnFestivalParticipants = new FastMap<>();
- _dawnPreviousParticipants = new FastMap<>();
- _dawnFestivalScores = new FastMap<>();
+ _dawnFestivalParticipants = new HashMap<>();
+ _dawnPreviousParticipants = new HashMap<>();
+ _dawnFestivalScores = new HashMap<>();
- _duskFestivalParticipants = new FastMap<>();
- _duskPreviousParticipants = new FastMap<>();
- _duskFestivalScores = new FastMap<>();
+ _duskFestivalParticipants = new HashMap<>();
+ _duskPreviousParticipants = new HashMap<>();
+ _duskFestivalScores = new HashMap<>();
- _festivalData = new FastMap<>();
+ _festivalData = new HashMap<>();
restoreFestivalData();
@@ -967,7 +965,7 @@
if (tempData == null)
{
- tempData = new FastMap<>();
+ tempData = new HashMap<>();
}
tempData.put(festivalId, festivalDat);
@@ -1198,7 +1196,7 @@
_duskFestivalScores.clear();
// Set up a new data set for the current cycle of festivals
- Map<Integer, StatsSet> newData = new FastMap<>();
+ Map<Integer, StatsSet> newData = new HashMap<>();
for (int i = 0; i < (FESTIVAL_COUNT * 2); i++)
{
@@ -1778,7 +1776,7 @@
public FestivalManager()
{
- _festivalInstances = new FastMap<>();
+ _festivalInstances = new HashMap<>();
_managerInstance = this;
// Increment the cycle counter.
@@ -2066,8 +2064,8 @@
{
_cabal = cabal;
_levelRange = levelRange;
- _originalLocations = new FastMap<>();
- _npcInsts = new FastList<>();
+ _originalLocations = new HashMap<>();
+ _npcInsts = new ArrayList<>();
if (cabal == SevenSigns.CABAL_DAWN)
{
Index: java/com/l2jserver/gameserver/Announcements.java
===================================================================
--- java/com/l2jserver/gameserver/Announcements.java (revision 6473)
+++ java/com/l2jserver/gameserver/Announcements.java (working copy)
@@ -23,6 +23,7 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.LineNumberReader;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.StringTokenizer;
@@ -29,8 +30,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.cache.HtmCache;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -47,9 +46,9 @@
{
private static Logger _log = Logger.getLogger(Announcements.class.getName());
- private final List<String> _announcements = new FastList<>();
- private final List<String> _critAnnouncements = new FastList<>();
- private final List<List<Object>> _eventAnnouncements = new FastList<>();
+ private final List<String> _announcements = new ArrayList<>();
+ private final List<String> _critAnnouncements = new ArrayList<>();
+ private final List<List<Object>> _eventAnnouncements = new ArrayList<>();
protected Announcements()
{
@@ -111,7 +110,7 @@
public void addEventAnnouncement(DateRange validDateRange, String... msg)
{
- List<Object> entry = new FastList<>();
+ List<Object> entry = new ArrayList<>();
entry.add(validDateRange);
entry.add(msg);
_eventAnnouncements.add(entry);
Index: java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java
===================================================================
--- java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java (revision 6473)
+++ java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java (working copy)
@@ -22,6 +22,7 @@
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
@@ -29,8 +30,6 @@
import javax.xml.parsers.DocumentBuilderFactory;
-import javolution.util.FastList;
-
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -370,7 +369,7 @@
}
byte room;
- FastList<Byte> emptyRooms;
+ ArrayList<Byte> emptyRooms;
do
{
emptyRooms = getFreeRooms(type);
@@ -460,9 +459,9 @@
return (count < (_rooms.get(type).size() - 1));
}
- public FastList<Byte> getFreeRooms(byte type)
+ public ArrayList<Byte> getFreeRooms(byte type)
{
- FastList<Byte> list = new FastList<>();
+ ArrayList<Byte> list = new ArrayList<>();
for (DimensionalRiftRoom room : _rooms.get(type).values())
{
if (!room.isPartyInside())
Index: java/com/l2jserver/tools/configurator/ConfigUserInterface.java
===================================================================
--- java/com/l2jserver/tools/configurator/ConfigUserInterface.java (revision 6473)
+++ java/com/l2jserver/tools/configurator/ConfigUserInterface.java (working copy)
@@ -36,6 +36,7 @@
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.NoSuchElementException;
@@ -62,8 +63,6 @@
import javax.swing.ToolTipManager;
import javax.swing.UIManager;
-import javolution.util.FastList;
-
import com.l2jserver.tools.configurator.ConfigUserInterface.ConfigFile.ConfigComment;
import com.l2jserver.tools.configurator.ConfigUserInterface.ConfigFile.ConfigProperty;
import com.l2jserver.tools.i18n.LanguageControl;
@@ -80,7 +79,7 @@
private final JTabbedPane _tabPane = new JTabbedPane();
- private List<ConfigFile> _configs = new FastList<>();
+ private List<ConfigFile> _configs = new ArrayList<>();
private ResourceBundle _bundle;
@@ -373,7 +372,7 @@
{
private final File _file;
private String _name;
- private final List<ConfigComment> _configs = new FastList<>();
+ private final List<ConfigComment> _configs = new ArrayList<>();
public ConfigFile(File file)
{
Index: java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java (working copy)
@@ -21,6 +21,7 @@
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -28,8 +29,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
@@ -295,7 +294,7 @@
int buff_index = 0;
- final List<Integer> storedSkills = new FastList<>();
+ final List<Integer> storedSkills = new ArrayList<>();
// Store all effect data along with calculated remaining
if (storeEffects)
@@ -354,7 +353,7 @@
}
if (!SummonEffectsTable.getInstance().getServitorEffects(getOwner()).containsKey(getReferenceSkill()))
{
- SummonEffectsTable.getInstance().getServitorEffects(getOwner()).put(getReferenceSkill(), new FastList<SummonEffect>());
+ SummonEffectsTable.getInstance().getServitorEffects(getOwner()).put(getReferenceSkill(), new ArrayList<SummonEffect>());
}
SummonEffectsTable.getInstance().getServitorEffects(getOwner()).get(getReferenceSkill()).add(SummonEffectsTable.getInstance().new SummonEffect(skill, info.getTime()));
@@ -410,7 +409,7 @@
}
if (!SummonEffectsTable.getInstance().getServitorEffects(getOwner()).containsKey(getReferenceSkill()))
{
- SummonEffectsTable.getInstance().getServitorEffects(getOwner()).put(getReferenceSkill(), new FastList<SummonEffect>());
+ SummonEffectsTable.getInstance().getServitorEffects(getOwner()).put(getReferenceSkill(), new ArrayList<SummonEffect>());
}
SummonEffectsTable.getInstance().getServitorEffects(getOwner()).get(getReferenceSkill()).add(SummonEffectsTable.getInstance().new SummonEffect(skill, effectCurTime));
Index: java/com/l2jserver/gameserver/network/serverpackets/ExShowSellCropList.java
===================================================================
--- java/com/l2jserver/gameserver/network/serverpackets/ExShowSellCropList.java (revision 6473)
+++ java/com/l2jserver/gameserver/network/serverpackets/ExShowSellCropList.java (working copy)
@@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
+import java.util.HashMap;
import java.util.List;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.datatables.ManorData;
import com.l2jserver.gameserver.model.CropProcure;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -34,14 +33,14 @@
public class ExShowSellCropList extends L2GameServerPacket
{
private int _manorId = 1;
- private final FastMap<Integer, L2ItemInstance> _cropsItems;
- private final FastMap<Integer, CropProcure> _castleCrops;
+ private final HashMap<Integer, L2ItemInstance> _cropsItems;
+ private final HashMap<Integer, CropProcure> _castleCrops;
public ExShowSellCropList(L2PcInstance player, int manorId, List<CropProcure> crops)
{
_manorId = manorId;
- _castleCrops = new FastMap<>();
- _cropsItems = new FastMap<>();
+ _castleCrops = new HashMap<>();
+ _cropsItems = new HashMap<>();
List<Integer> allCrops = ManorData.getInstance().getAllCrops();
for (int cropId : allCrops)
Index: java/com/l2jserver/gameserver/model/entity/BlockCheckerEngine.java
===================================================================
--- java/com/l2jserver/gameserver/model/entity/BlockCheckerEngine.java (revision 6473)
+++ java/com/l2jserver/gameserver/model/entity/BlockCheckerEngine.java (working copy)
@@ -18,14 +18,13 @@
*/
package com.l2jserver.gameserver.model.entity;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Map.Entry;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.NpcData;
@@ -63,8 +62,8 @@
// The object which holds all basic members info
protected ArenaParticipantsHolder _holder;
// Maps to hold player of each team and his points
- protected FastMap<L2PcInstance, Integer> _redTeamPoints = new FastMap<>();
- protected FastMap<L2PcInstance, Integer> _blueTeamPoints = new FastMap<>();
+ protected HashMap<L2PcInstance, Integer> _redTeamPoints = new HashMap<>();
+ protected HashMap<L2PcInstance, Integer> _blueTeamPoints = new HashMap<>();
// The initial points of the event
protected int _redPoints = 15;
protected int _bluePoints = 15;
@@ -71,7 +70,7 @@
// Current used arena
protected int _arena = -1;
// All blocks
- protected FastList<L2Spawn> _spawns = new FastList<>();
+ protected ArrayList<L2Spawn> _spawns = new ArrayList<>();
// Sets if the red team won the event at the end of this (used for packets)
protected boolean _isRedWinner;
// Time when the event starts. Used on packet sending
@@ -120,7 +119,7 @@
// Common z coordinate
private static final int _zCoord = -2405;
// List of dropped items in event (for later deletion)
- protected FastList<L2ItemInstance> _drops = new FastList<>();
+ protected ArrayList<L2ItemInstance> _drops = new ArrayList<>();
// Default arena
private static final byte DEFAULT_ARENA = -1;
// Event is started
@@ -661,7 +660,7 @@
*/
private void rewardAsWinner(boolean isRed)
{
- FastMap<L2PcInstance, Integer> tempPoints = isRed ? _redTeamPoints : _blueTeamPoints;
+ HashMap<L2PcInstance, Integer> tempPoints = isRed ? _redTeamPoints : _blueTeamPoints;
// Main give
for (Entry<L2PcInstance, Integer> points : tempPoints.entrySet())
@@ -718,7 +717,7 @@
*/
private void rewardAsLooser(boolean isRed)
{
- FastMap<L2PcInstance, Integer> tempPoints = isRed ? _redTeamPoints : _blueTeamPoints;
+ HashMap<L2PcInstance, Integer> tempPoints = isRed ? _redTeamPoints : _blueTeamPoints;
for (Entry<L2PcInstance, Integer> entry : tempPoints.entrySet())
{
Raw
drop javolution (dp).diff
### Eclipse Workspace Patch 1.0
#P L2J_DataPack_BETA
Index: dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java
===================================================================
--- dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java (revision 10245)
+++ dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java (working copy)
@@ -25,8 +25,6 @@
import java.util.List;
import java.util.Map;
-import javolution.util.FastMap;
-
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -46,7 +44,7 @@
public class TarBeetleSpawn extends DocumentParser
{
private static final Map<Integer, SpawnZone> _spawnZoneList = new HashMap<>();
- private static final Map<Integer, L2Npc> _spawnList = new FastMap<>();
+ private static final Map<Integer, L2Npc> _spawnList = new HashMap<>();
public static List<Integer> lowerZones = new ArrayList<>();
public static List<Integer> upperZones = new ArrayList<>();
Index: dist/game/data/scripts/ai/group_template/PolymorphingAngel.java
===================================================================
--- dist/game/data/scripts/ai/group_template/PolymorphingAngel.java (revision 10245)
+++ dist/game/data/scripts/ai/group_template/PolymorphingAngel.java (working copy)
@@ -18,9 +18,9 @@
*/
package ai.group_template;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -32,7 +32,7 @@
*/
public class PolymorphingAngel extends AbstractNpcAI
{
- private static final Map<Integer, Integer> ANGELSPAWNS = new FastMap<>();
+ private static final Map<Integer, Integer> ANGELSPAWNS = new HashMap<>();
static
{
ANGELSPAWNS.put(20830, 20859);
Index: dist/game/data/scripts/ai/group_template/FeedableBeasts.java
===================================================================
--- dist/game/data/scripts/ai/group_template/FeedableBeasts.java (revision 10245)
+++ dist/game/data/scripts/ai/group_template/FeedableBeasts.java (working copy)
@@ -18,9 +18,9 @@
*/
package ai.group_template;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
import ai.npc.AbstractNpcAI;
@@ -68,7 +68,7 @@
};
// @formatter:on
- private static final Map<Integer, Integer> MAD_COW_POLYMORPH = new FastMap<>();
+ private static final Map<Integer, Integer> MAD_COW_POLYMORPH = new HashMap<>();
static
{
MAD_COW_POLYMORPH.put(21824, 21468);
@@ -121,8 +121,8 @@
NpcStringId.ANIMALS_NEED_LOVE_TOO
};
- private static Map<Integer, Integer> _FeedInfo = new FastMap<>();
- private static Map<Integer, GrowthCapableMob> _GrowthCapableMobs = new FastMap<>();
+ private static Map<Integer, Integer> _FeedInfo = new HashMap<>();
+ private static Map<Integer, GrowthCapableMob> _GrowthCapableMobs = new HashMap<>();
// all mobs that grow by eating
private static class GrowthCapableMob
@@ -130,7 +130,7 @@
private final int _growthLevel;
private final int _chance;
- private final Map<Integer, int[][]> _spiceToMob = new FastMap<>();
+ private final Map<Integer, int[][]> _spiceToMob = new HashMap<>();
public GrowthCapableMob(int growthLevel, int chance)
{
Index: dist/game/data/scripts/ai/individual/DemonPrince.java
===================================================================
--- dist/game/data/scripts/ai/individual/DemonPrince.java (revision 10245)
+++ dist/game/data/scripts/ai/individual/DemonPrince.java (working copy)
@@ -18,9 +18,9 @@
*/
package ai.individual;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -45,7 +45,7 @@
new SkillHolder(5376, 6)
};
- private static final Map<Integer, Boolean> ATTACK_STATE = new FastMap<>();
+ private static final Map<Integer, Boolean> ATTACK_STATE = new HashMap<>();
private DemonPrince()
{
Index: dist/game/data/scripts/ai/individual/DarkWaterDragon.java
===================================================================
--- dist/game/data/scripts/ai/individual/DarkWaterDragon.java (revision 10245)
+++ dist/game/data/scripts/ai/individual/DarkWaterDragon.java (working copy)
@@ -18,10 +18,10 @@
*/
package ai.individual;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javolution.util.FastSet;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -44,8 +44,8 @@
private static final int FAFURION = 18482;
private static final int DETRACTOR1 = 22270;
private static final int DETRACTOR2 = 22271;
- private static Set<Integer> SECOND_SPAWN = new FastSet<>(); // Used to track if second Shades were already spawned
- private static Set<Integer> MY_TRACKING_SET = new FastSet<>(); // Used to track instances of npcs
+ private static Set<Integer> SECOND_SPAWN = new HashSet<>(); // Used to track if second Shades were already spawned
+ private static Set<Integer> MY_TRACKING_SET = new HashSet<>(); // Used to track instances of npcs
private static Map<Integer, L2PcInstance> ID_MAP = new L2FastMap<>(true); // Used to track instances of npcs
private DarkWaterDragon()
Index: dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java
===================================================================
--- dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java (revision 10245)
+++ dist/game/data/scripts/hellbound/TullyWorkshop/TullyWorkshop.java (working copy)
@@ -18,7 +18,9 @@
*/
package hellbound.TullyWorkshop;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -25,9 +27,6 @@
import java.util.Set;
import java.util.concurrent.ScheduledFuture;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.datatables.DoorTable;
@@ -110,8 +109,8 @@
22383
};
- private static final Map<Integer, int[]> TULLY_DOORLIST = new FastMap<>();
- private static final Map<Integer, int[][]> TELE_COORDS = new FastMap<>();
+ private static final Map<Integer, int[]> TULLY_DOORLIST = new HashMap<>();
+ private static final Map<Integer, int[][]> TELE_COORDS = new HashMap<>();
protected int countdownTime;
private int nextServantIdx = 0;
@@ -124,14 +123,14 @@
protected ScheduledFuture<?> _countdown = null;
// NPC's, spawned after Tully's death are stored here
- protected static List<L2Npc> postMortemSpawn = new FastList<>();
+ protected static List<L2Npc> postMortemSpawn = new ArrayList<>();
// TODO: Zoey76: Not thread-safe, probably will lead to problems.
protected static Set<Integer> brokenContraptions = new HashSet<>();
protected static Set<Integer> rewardedContraptions = new HashSet<>();
protected static Set<Integer> talkedContraptions = new HashSet<>();
- private final List<L2MonsterInstance> spawnedFollowers = new FastList<>();
- private final List<L2MonsterInstance> spawnedFollowerMinions = new FastList<>();
+ private final List<L2MonsterInstance> spawnedFollowers = new ArrayList<>();
+ private final List<L2MonsterInstance> spawnedFollowerMinions = new ArrayList<>();
private L2Npc spawnedAgent = null;
private L2Spawn pillarSpawn = null;
Index: dist/game/data/scripts/ai/individual/Orfen.java
===================================================================
--- dist/game/data/scripts/ai/individual/Orfen.java (revision 10245)
+++ dist/game/data/scripts/ai/individual/Orfen.java (working copy)
@@ -18,9 +18,9 @@
*/
package ai.individual;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
import ai.npc.AbstractNpcAI;
import com.l2jserver.Config;
@@ -72,7 +72,7 @@
private static final int RIBA_IREN = 29018;
private static boolean _IsTeleported;
- private static List<L2Attackable> _Minions = new FastList<>();
+ private static List<L2Attackable> _Minions = new ArrayList<>();
private static L2BossZone ZONE;
private static final byte ALIVE = 0;
Index: dist/game/data/scripts/ai/individual/QueenAnt.java
===================================================================
--- dist/game/data/scripts/ai/individual/QueenAnt.java (revision 10245)
+++ dist/game/data/scripts/ai/individual/QueenAnt.java (working copy)
@@ -18,9 +18,9 @@
*/
package ai.individual;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
import ai.npc.AbstractNpcAI;
import com.l2jserver.Config;
@@ -82,7 +82,7 @@
private L2MonsterInstance _queen = null;
private L2MonsterInstance _larva = null;
- private final List<L2MonsterInstance> _nurses = new FastList<>(5);
+ private final List<L2MonsterInstance> _nurses = new ArrayList<>(5);
private QueenAnt()
{
Index: dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
===================================================================
--- dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java (revision 10245)
+++ dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java (working copy)
@@ -18,9 +18,9 @@
*/
package ai.npc.Teleports.TeleportToRaceTrack;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.Location;
@@ -40,7 +40,7 @@
// NPC
private static final int RACE_MANAGER = 30995;
// Misc
- private static final Map<Integer, Integer> TELEPORTERS = new FastMap<>();
+ private static final Map<Integer, Integer> TELEPORTERS = new HashMap<>();
// Locations
private static final Location[] RETURN_LOCS =
{
Index: dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
===================================================================
--- dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java (revision 10245)
+++ dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java (working copy)
@@ -18,10 +18,9 @@
*/
package handlers.bypasshandlers;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.cache.HtmCache;
import com.l2jserver.gameserver.enums.QuestEventType;
@@ -242,7 +241,7 @@
public static void showQuestWindow(L2PcInstance player, L2Npc npc)
{
// collect awaiting quests and start points
- List<Quest> options = new FastList<>();
+ List<Quest> options = new ArrayList<>();
QuestState[] awaits = player.getQuestsForTalk(npc.getTemplate().getId());
List<Quest> starts = npc.getTemplate().getEventQuests(QuestEventType.QUEST_START);
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java (revision 10245)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java (working copy)
@@ -21,8 +21,6 @@
import java.util.StringTokenizer;
import java.util.logging.Logger;
-import javolution.text.TextBuilder;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.AdminTable;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
@@ -318,7 +316,7 @@
public void showConfigPage(L2PcInstance activeChar)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
- TextBuilder replyMSG = new TextBuilder("<html><title>L2J :: Config</title><body>");
+ StringBuilder replyMSG = new StringBuilder("<html><title>L2J :: Config</title><body>");
replyMSG.append("<center><table width=270><tr><td width=60><button value=\"Main\" action=\"bypass -h admin_admin\" width=60 height=25 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td width=150>Config Server Panel</td><td width=60><button value=\"Back\" action=\"bypass -h admin_admin4\" width=60 height=25 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table></center><br>");
replyMSG.append("<center><table width=260><tr><td width=140></td><td width=40></td><td width=40></td></tr>");
replyMSG.append("<tr><td><font color=\"00AA00\">Drop:</font></td><td></td><td></td></tr>");
Index: dist/game/data/scripts/ai/group_template/BeastFarm.java
===================================================================
--- dist/game/data/scripts/ai/group_template/BeastFarm.java (revision 10245)
+++ dist/game/data/scripts/ai/group_template/BeastFarm.java (working copy)
@@ -19,10 +19,10 @@
package ai.group_template;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javolution.util.FastMap;
import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
import ai.npc.AbstractNpcAI;
@@ -108,8 +108,8 @@
18900
};
- private static Map<Integer, Integer> _FeedInfo = new FastMap<>();
- private static Map<Integer, GrowthCapableMob> _GrowthCapableMobs = new FastMap<>();
+ private static Map<Integer, Integer> _FeedInfo = new HashMap<>();
+ private static Map<Integer, GrowthCapableMob> _GrowthCapableMobs = new HashMap<>();
private static List<TamedBeast> TAMED_BEAST_DATA = new ArrayList<>();
private BeastFarm()
@@ -399,7 +399,7 @@
private final int _chance;
private final int _growthLevel;
private final int _tameNpcId;
- private final Map<Integer, Integer> _skillSuccessNpcIdList = new FastMap<>();
+ private final Map<Integer, Integer> _skillSuccessNpcIdList = new HashMap<>();
public GrowthCapableMob(int chance, int growthLevel, int tameNpcId)
{
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java
===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java (revision 10245)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java (working copy)
@@ -23,8 +23,6 @@
import java.sql.ResultSet;
import java.util.logging.Logger;
-import javolution.text.TextBuilder;
-
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.instancemanager.QuestManager;
@@ -158,7 +156,7 @@
private static void showFirstQuestMenu(L2PcInstance target, L2PcInstance actor)
{
- TextBuilder replyMSG = new TextBuilder("<html><body><table width=270><tr><td width=45><button value=\"Main\" action=\"bypass -h admin_admin\" width=45 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td width=180><center>Player: " + target.getName() + "</center></td><td width=45><button value=\"Back\" action=\"bypass -h admin_admin6\" width=45 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table>");
+ StringBuilder replyMSG = new StringBuilder("<html><body><table width=270><tr><td width=45><button value=\"Main\" action=\"bypass -h admin_admin\" width=45 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td width=180><center>Player: " + target.getName() + "</center></td><td width=45><button value=\"Back\" action=\"bypass -h admin_admin6\" width=45 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table>");
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
int ID = target.getObjectId();
@@ -182,7 +180,7 @@
PreparedStatement req;
int ID = target.getObjectId();
- TextBuilder replyMSG = new TextBuilder("<html><body>");
+ StringBuilder replyMSG = new StringBuilder("<html><body>");
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
if (val[0].equals("full"))
Index: dist/game/data/scripts/ai/group_template/SeedOfAnnihilation.java
===================================================================
--- dist/game/data/scripts/ai/group_template/SeedOfAnnihilation.java (revision 10245)
+++ dist/game/data/scripts/ai/group_template/SeedOfAnnihilation.java (working copy)
@@ -19,9 +19,9 @@
package ai.group_template;
import java.util.Calendar;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.datatables.SkillData;
@@ -43,7 +43,7 @@
*/
public class SeedOfAnnihilation extends AbstractNpcAI
{
- private static final Map<Integer, Location> _teleportZones = new FastMap<>();
+ private static final Map<Integer, Location> _teleportZones = new HashMap<>();
private static final int ANNIHILATION_FURNACE = 18928;
// Strength, Agility, Wisdom
Index: dist/game/data/scripts/ai/group_template/RandomSpawn.java
===================================================================
--- dist/game/data/scripts/ai/group_template/RandomSpawn.java (revision 10245)
+++ dist/game/data/scripts/ai/group_template/RandomSpawn.java (working copy)
@@ -18,9 +18,9 @@
*/
package ai.group_template;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ThreadPoolManager;
@@ -33,7 +33,7 @@
*/
public final class RandomSpawn extends AbstractNpcAI
{
- private static Map<Integer, Location[]> SPAWN_POINTS = new FastMap<>();
+ private static Map<Integer, Location[]> SPAWN_POINTS = new HashMap<>();
static
{
// Keltas
Index: dist/game/data/scripts/hellbound/BaseTower/BaseTower.java
===================================================================
--- dist/game/data/scripts/hellbound/BaseTower/BaseTower.java (revision 10245)
+++ dist/game/data/scripts/hellbound/BaseTower/BaseTower.java (working copy)
@@ -18,10 +18,9 @@
*/
package hellbound.BaseTower;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.datatables.DoorTable;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -38,7 +37,7 @@
private static final int KENDAL = 32301;
private static final int BODY_DESTROYER = 22363;
- private static final Map<Integer, L2PcInstance> BODY_DESTROYER_TARGET_LIST = new FastMap<>();
+ private static final Map<Integer, L2PcInstance> BODY_DESTROYER_TARGET_LIST = new HashMap<>();
private static final SkillHolder DEATH_WORD = new SkillHolder(5256, 1);
Index: dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java
===================================================================
--- dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java (revision 10245)
+++ dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java (working copy)
@@ -18,9 +18,9 @@
*/
package ai.npc.Teleports.TeleportToFantasy;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.Location;
@@ -42,7 +42,7 @@
// NPC
private static final int PADDIES = 32378;
// Misc
- private static final Map<Integer, Integer> TELEPORTERS = new FastMap<>();
+ private static final Map<Integer, Integer> TELEPORTERS = new HashMap<>();
// Locations
private static final Location[] RETURN_LOCS =
{
Index: dist/game/data/scripts/hellbound/AnomicFoundry/AnomicFoundry.java
===================================================================
--- dist/game/data/scripts/hellbound/AnomicFoundry/AnomicFoundry.java (revision 10245)
+++ dist/game/data/scripts/hellbound/AnomicFoundry/AnomicFoundry.java (working copy)
@@ -18,10 +18,9 @@
*/
package hellbound.AnomicFoundry;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.datatables.SpawnTable;
import com.l2jserver.gameserver.instancemanager.HellboundManager;
@@ -104,7 +103,7 @@
0,
0
};
- private final Map<Integer, Integer> _atkIndex = new FastMap<>();
+ private final Map<Integer, Integer> _atkIndex = new HashMap<>();
public AnomicFoundry(int questId, String name, String descr)
{
Index: dist/game/data/scripts/ai/individual/Core.java
===================================================================
--- dist/game/data/scripts/ai/individual/Core.java (revision 10245)
+++ dist/game/data/scripts/ai/individual/Core.java (working copy)
@@ -18,9 +18,9 @@
*/
package ai.individual;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
import ai.npc.AbstractNpcAI;
import com.l2jserver.Config;
@@ -56,7 +56,7 @@
private static boolean _FirstAttacked;
- private final List<L2Attackable> Minions = new FastList<>();
+ private final List<L2Attackable> Minions = new ArrayList<>();
private Core()
{
Index: dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java
===================================================================
--- dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java (revision 10245)
+++ dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java (working copy)
@@ -18,9 +18,9 @@
*/
package ai.npc.Teleports.NewbieTravelToken;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.Location;
@@ -39,7 +39,7 @@
// Item
private static final int NEWBIE_TRAVEL_TOKEN = 8542;
// NPC Id - Teleport Location
- private static final Map<Integer, Location> DATA = new FastMap<>();
+ private static final Map<Integer, Location> DATA = new HashMap<>();
private NewbieTravelToken()
{
Index: dist/game/data/scripts/ai/individual/Keltas.java
===================================================================
--- dist/game/data/scripts/ai/individual/Keltas.java (revision 10245)
+++ dist/game/data/scripts/ai/individual/Keltas.java (working copy)
@@ -18,9 +18,9 @@
*/
package ai.individual;
+import java.util.ArrayList;
import java.util.List;
-import javolution.util.FastList;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.L2Spawn;
@@ -111,7 +111,7 @@
addKillId(KELTAS);
addSpawnId(KELTAS);
- _spawnedMonsters = new FastList<>();
+ _spawnedMonsters = new ArrayList<>();
}
private void spawnMinions()
Index: dist/game/data/scripts/ai/fantasy_isle/MC_Show.java
===================================================================
--- dist/game/data/scripts/ai/fantasy_isle/MC_Show.java (revision 10245)
+++ dist/game/data/scripts/ai/fantasy_isle/MC_Show.java (working copy)
@@ -19,9 +19,9 @@
package ai.fantasy_isle;
import java.text.SimpleDateFormat;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.Config;
@@ -175,8 +175,8 @@
}
}
- private static Map<String, ShoutInfo> talks = new FastMap<>();
- private static Map<String, WalkInfo> walks = new FastMap<>();
+ private static Map<String, ShoutInfo> talks = new HashMap<>();
+ private static Map<String, WalkInfo> walks = new HashMap<>();
private MC_Show()
{
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java
===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java (revision 10245)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java (working copy)
@@ -21,8 +21,6 @@
import java.util.List;
import java.util.StringTokenizer;
-import javolution.text.TextBuilder;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.Announcements;
import com.l2jserver.gameserver.cache.HtmCache;
@@ -261,7 +259,7 @@
activeChar.sendMessage("Not enough parameters for adding autoannounce!");
return false;
}
- TextBuilder memo = new TextBuilder();
+ StringBuilder memo = new StringBuilder();
while (st.hasMoreTokens())
{
memo.append(st.nextToken());
@@ -305,7 +303,7 @@
for (int i = 0; i < autoannouncements.size(); i++)
{
AutoAnnouncement autoann = autoannouncements.get(i);
- TextBuilder memo2 = new TextBuilder();
+ StringBuilder memo2 = new StringBuilder();
for (String memo0 : autoann.getMemo())
{
memo2.append(memo0);
Index: dist/game/data/scripts/ai/individual/SinWardens.java
===================================================================
--- dist/game/data/scripts/ai/individual/SinWardens.java (revision 10245)
+++ dist/game/data/scripts/ai/individual/SinWardens.java (working copy)
@@ -18,9 +18,9 @@
*/
package ai.individual;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -54,7 +54,7 @@
22438
};
- private final Map<Integer, Integer> killedMinionsCount = new FastMap<>();
+ private final Map<Integer, Integer> killedMinionsCount = new HashMap<>();
private SinWardens()
{
Index: dist/game/data/scripts/ai/individual/Ranku.java
===================================================================
--- dist/game/data/scripts/ai/individual/Ranku.java (revision 10245)
+++ dist/game/data/scripts/ai/individual/Ranku.java (working copy)
@@ -19,8 +19,8 @@
package ai.individual;
import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
-import javolution.util.FastSet;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -42,7 +42,7 @@
private static final int MINION = 32305;
private static final int MINION_2 = 25543;
- private static final Set<Integer> MY_TRACKING_SET = new FastSet<Integer>().shared();
+ private static final Set<Integer> MY_TRACKING_SET = new CopyOnWriteArraySet<>();
private Ranku()
{
Index: dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
===================================================================
--- dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java (revision 10245)
+++ dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java (working copy)
@@ -18,12 +18,11 @@
*/
package instances.CrystalCaverns;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -81,7 +80,7 @@
private class CCWorld extends InstanceWorld
{
- public Map<L2Npc, Boolean> npcList1 = new FastMap<>();
+ public Map<L2Npc, Boolean> npcList1 = new HashMap<>();
public L2Npc tears;
public boolean isUsedInvulSkill = false;
public long dragonScaleStart = 0;
@@ -88,8 +87,8 @@
public int dragonScaleNeed = 0;
public int cleanedRooms = 0;
public long endTime = 0;
- public List<L2Npc> copys = new FastList<>();
- public Map<L2Npc, CrystalGolem> crystalGolems = new FastMap<>();
+ public List<L2Npc> copys = new ArrayList<>();
+ public Map<L2Npc, CrystalGolem> crystalGolems = new HashMap<>();
public int correctGolems = 0;
public boolean[] OracleTriggered =
{
@@ -105,18 +104,18 @@
0,
0
}; // 0: not spawned, 1: spawned, 2: cleared
- public Map<L2DoorInstance, L2PcInstance> openedDoors = new FastMap<>();
- public Map<Integer, Map<L2Npc, Boolean>> npcList2 = new FastMap<>();
- public Map<L2Npc, L2Npc> oracles = new FastMap<>();
- public List<L2Npc> keyKeepers = new FastList<>();
- public List<L2Npc> guards = new FastList<>();
- public List<L2Npc> oracle = new FastList<>();
+ public Map<L2DoorInstance, L2PcInstance> openedDoors = new HashMap<>();
+ public Map<Integer, Map<L2Npc, Boolean>> npcList2 = new HashMap<>();
+ public Map<L2Npc, L2Npc> oracles = new HashMap<>();
+ public List<L2Npc> keyKeepers = new ArrayList<>();
+ public List<L2Npc> guards = new ArrayList<>();
+ public List<L2Npc> oracle = new ArrayList<>();
// baylor variables
- protected final List<L2PcInstance> _raiders = new FastList<>();
+ protected final List<L2PcInstance> _raiders = new ArrayList<>();
protected int _raidStatus = 0;
protected long _dragonClawStart = 0;
protected int _dragonClawNeed = 0;
- protected final List<L2Npc> _animationMobs = new FastList<>();
+ protected final List<L2Npc> _animationMobs = new ArrayList<>();
protected L2Npc _camera = null;
protected L2Npc _baylor = null;
protected L2Npc _alarm = null;
@@ -1776,7 +1775,7 @@
{
world.setStatus(3);
- Map<L2Npc, Boolean> spawnList = new FastMap<>();
+ Map<L2Npc, Boolean> spawnList = new HashMap<>();
for (int[] spawn : EMERALD_SPAWNS)
{
L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.getInstanceId());
@@ -1787,7 +1786,7 @@
protected void runEmeraldRooms(CCWorld world, int[][] spawnList, int room)
{
- Map<L2Npc, Boolean> spawned = new FastMap<>();
+ Map<L2Npc, Boolean> spawned = new HashMap<>();
for (int[] spawn : spawnList)
{
L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.getInstanceId());
@@ -1815,7 +1814,7 @@
{
world.setStatus(status);
- Map<L2Npc, Boolean> spawned = new FastMap<>();
+ Map<L2Npc, Boolean> spawned = new HashMap<>();
for (int[] spawn : spawnList)
{
L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.getInstanceId());
@@ -2361,7 +2360,7 @@
return "";
}
CrystalGolem cryGolem = world.crystalGolems.get(npc);
- List<L2Object> crystals = new FastList<>();
+ List<L2Object> crystals = new ArrayList<>();
for (L2Object object : L2World.getInstance().getVisibleObjects(npc, 300))
{
if ((object instanceof L2ItemInstance) && (object.getId() == CRYSTALFOOD))
Index: dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java
===================================================================
--- dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java (revision 10245)
+++ dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java (working copy)
@@ -18,10 +18,10 @@
*/
package instances.DisciplesNecropolisPast;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastList;
import quests.Q00196_SevenSignsSealOfTheEmperor.Q00196_SevenSignsSealOfTheEmperor;
import com.l2jserver.gameserver.instancemanager.InstanceManager;
@@ -47,8 +47,8 @@
{
protected class DNPWorld extends InstanceWorld
{
- protected final FastList<L2Npc> anakimGroup = new FastList<>();
- protected final FastList<L2Npc> lilithGroup = new FastList<>();
+ protected final ArrayList<L2Npc> anakimGroup = new ArrayList<>();
+ protected final ArrayList<L2Npc> lilithGroup = new ArrayList<>();
protected long storeTime = 0;
protected int countKill = 0;
}
@@ -208,7 +208,7 @@
return world.getInstanceId();
}
- private void makeCast(L2Npc npc, FastList<L2Npc> targets)
+ private void makeCast(L2Npc npc, ArrayList<L2Npc> targets)
{
npc.setTarget(targets.get(getRandom(targets.size())));
if (SKILLS.containsKey(npc.getId()))
Index: dist/game/data/scripts/ai/group_template/EnergySeeds.java
===================================================================
--- dist/game/data/scripts/ai/group_template/EnergySeeds.java (revision 10245)
+++ dist/game/data/scripts/ai/group_template/EnergySeeds.java (working copy)
@@ -18,9 +18,10 @@
*/
package ai.group_template;
+import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
-import javolution.util.FastMap;
import quests.Q00692_HowtoOpposeEvil.Q00692_HowtoOpposeEvil;
import ai.npc.AbstractNpcAI;
@@ -58,8 +59,8 @@
private static final int RATE = 1;
private static final int RESPAWN = 480000;
private static final int RANDOM_RESPAWN_OFFSET = 180000;
- private static Map<Integer, ESSpawn> _spawns = new FastMap<>();
- protected static Map<L2Npc, Integer> _spawnedNpcs = new FastMap<L2Npc, Integer>().shared();
+ private static Map<Integer, ESSpawn> _spawns = new HashMap<>();
+ protected static Map<L2Npc, Integer> _spawnedNpcs = new ConcurrentHashMap<>();
private static final int TEMPORARY_TELEPORTER = 32602;
// @formatter:off
Index: dist/game/data/scripts/hellbound/Engine.java
===================================================================
--- dist/game/data/scripts/hellbound/Engine.java (revision 10245)
+++ dist/game/data/scripts/hellbound/Engine.java (working copy)
@@ -19,13 +19,12 @@
package hellbound;
import java.io.File;
+import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import javax.xml.parsers.DocumentBuilderFactory;
-import javolution.util.FastMap;
-
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -85,7 +84,7 @@
private int _cachedLevel = -1;
- private static Map<Integer, PointsInfoHolder> pointsInfo = new FastMap<>();
+ private static Map<Integer, PointsInfoHolder> pointsInfo = new HashMap<>();
// Holds info about points for mob killing
private class PointsInfoHolder
Index: dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
===================================================================
--- dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java (revision 10245)
+++ dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java (working copy)
@@ -18,10 +18,9 @@
*/
package custom.EchoCrystals;
+import java.util.HashMap;
import java.util.Map;
-import javolution.util.FastMap;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
@@ -44,7 +43,7 @@
private static final int ADENA = 57;
private static final int COST = 200;
- private static final Map<Integer, ScoreData> SCORES = new FastMap<>();
+ private static final Map<Integer, ScoreData> SCORES = new HashMap<>();
private class ScoreData
{
Index: dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
===================================================================
--- dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java (revision 10245)
+++ dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java (working copy)
@@ -18,8 +18,8 @@
*/
package instances.DarkCloudMansion;
-import javolution.util.FastList;
-import javolution.util.FastMap;
+import java.util.ArrayList;
+import java.util.HashMap;
import com.l2jserver.gameserver.instancemanager.InstanceManager;
import com.l2jserver.gameserver.model.L2Party;
@@ -469,7 +469,7 @@
protected static class DMCRoom
{
- public FastList<DMCNpc> npcList = new FastList<>();
+ public ArrayList<DMCNpc> npcList = new ArrayList<>();
public int counter = 0;
public int reset = 0;
public int founded = 0;
@@ -478,7 +478,7 @@
protected class DMCWorld extends InstanceWorld
{
- public FastMap<String, DMCRoom> rooms = new FastMap<>();
+ public HashMap<String, DMCRoom> rooms = new HashMap<>();
}
private boolean checkConditions(L2PcInstance player)
Raw
remaining files.txt
Remove Javolution from...
Datapack:
ai.group_template;SummonMinions
custom.Validators;SubClassSkills
handlers.telnethandlers;DebugHandler
hellbound.TowerOfNaia;TowerOfNaia
instances.FinalEmperialTomb;FinalEmperialTomb
Core:
com.l2jserver.gameserver;GameTimeController
com.l2jserver.gameserver;LoginServerThread
com.l2jserver.gameserver;RecipeController
com.l2jserver.gameserver.communitybbs.Manager;ForumsBBSManager
com.l2jserver.gameserver.datatables;ItemTable
com.l2jserver.gameserver.instancemanager;FortSiegeManager
com.l2jserver.gameserver.instancemanager;MercTicketManager
com.l2jserver.gameserver.instancemanager;TerritoryWarManager
com.l2jserver.gameserver.model;ChanceSkillList
com.l2jserver.gameserver.model;CharEffectList
com.l2jserver.gameserver.model;L2Clan
com.l2jserver.gameserver.model;L2Party
com.l2jserver.gameserver.model;L2Spawn
com.l2jserver.gameserver.model;TradeList
com.l2jserver.gameserver.model.actor.instance;L2FortCommanderInstance
com.l2jserver.gameserver.model.actor.instance;L2PcInstance
com.l2jserver.gameserver.model.entity;FortSiege
com.l2jserver.gameserver.model.entity;Hero
com.l2jserver.gameserver.model.entity;TvTEvent
com.l2jserver.gameserver.model.itemcontainer;ClanWarehouse
com.l2jserver.gameserver.model.itemcontainer;PcInventory
com.l2jserver.gameserver.model.items.instance;L2ItemInstance
com.l2jserver.gameserver.model.zone;L2ZoneType
com.l2jserver.gameserver.model.zone.type;L2EffectZone
com.l2jserver.gameserver.network.clientpackets;RequestPrivateStoreBuy
com.l2jserver.gameserver.network.clientpackets;MultiSellChoose
com.l2jserver.gameserver.network.clientpackets;Say2
com.l2jserver.gameserver.network.communityserver.writepackets;InitWorldInfo
com.l2jserver.gameserver.network.communityserver.writepackets;WorldInfo
com.l2jserver.gameserver.network.serverpackets;ExReplyDominionInfo
com.l2jserver.gameserver.network.serverpackets;ExShowDominionRegistry
com.l2jserver.gameserver.network.serverpackets;ExShowFortressMapInfo
com.l2jserver.gameserver.network.serverpackets;ExShowFortressSiegeInfo
com.l2jserver.gameserver.network.serverpackets;RelationChanged
com.l2jserver.gameserver.pathfinding.cellnodes;CellPathFinding
com.l2jserver.gameserver.util;Util
com.l2jserver.loginserver;GameServerTable
com.l2jserver.loginserver;LoginController
com.l2jserver.util;L2FastList
com.l2jserver.util;L2FastMap
com.l2jserver.util;StringUtil
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment