Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: java/com/l2jserver/gameserver/LoginServerThread.java
- ===================================================================
- --- java/com/l2jserver/gameserver/LoginServerThread.java (revision 5101)
- +++ java/com/l2jserver/gameserver/LoginServerThread.java (working copy)
- @@ -295,7 +295,7 @@
- if (L2World.getInstance().getAllPlayersCount() > 0)
- {
- FastList<String> playerList = new FastList<String>();
- - for (L2PcInstance player : L2World.getInstance().getAllPlayersArray())
- + for (L2PcInstance player : L2World.getInstance().getAllPlayers().valueCollection())
- {
- playerList.add(player.getAccountName());
- }
- Index: java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java
- ===================================================================
- --- java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java (revision 5101)
- +++ java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java (working copy)
- @@ -273,7 +273,7 @@
- public/*synchronized */void changeCommunityBoard()
- {
- FastList<L2PcInstance> sortedPlayers = new FastList<L2PcInstance>();
- - Collections.addAll(sortedPlayers, L2World.getInstance().getAllPlayersArray());
- + sortedPlayers.addAll(L2World.getInstance().getAllPlayers().valueCollection());
- Collections.sort(sortedPlayers, new Comparator<L2PcInstance>()
- {
- @Override
- Index: java/com/l2jserver/gameserver/datatables/OfflineTradersTable.java
- ===================================================================
- --- java/com/l2jserver/gameserver/datatables/OfflineTradersTable.java (revision 5101)
- +++ java/com/l2jserver/gameserver/datatables/OfflineTradersTable.java (working copy)
- @@ -62,7 +62,7 @@
- PreparedStatement stm_items = con.prepareStatement(SAVE_ITEMS);
- //TextBuilder items = TextBuilder.newInstance();
- - for (L2PcInstance pc : L2World.getInstance().getAllPlayersArray())
- + for (L2PcInstance pc : L2World.getInstance().getAllPlayers().valueCollection())
- {
- try
- {
- Index: java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java
- ===================================================================
- --- java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java (revision 5101)
- +++ java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java (working copy)
- @@ -1120,7 +1120,7 @@
- {
- if (isTWInProgress())
- {
- - for(L2PcInstance player : L2World.getInstance().getAllPlayersArray())
- + for(L2PcInstance player : L2World.getInstance().getAllPlayers().valueCollection())
- if (player != null && player.getSiegeSide() > 0)
- giveTWPoint(player, 1000, 6);
- }
- Index: java/com/l2jserver/gameserver/model/entity/L2Event.java
- ===================================================================
- --- java/com/l2jserver/gameserver/model/entity/L2Event.java (revision 5101)
- +++ java/com/l2jserver/gameserver/model/entity/L2Event.java (working copy)
- @@ -372,7 +372,7 @@
- _eventInfo = inbr.readLine();
- List<L2PcInstance> temp = new FastList<L2PcInstance>();
- - for (L2PcInstance player : L2World.getInstance().getAllPlayersArray())
- + for (L2PcInstance player : L2World.getInstance().getAllPlayers().valueCollection())
- {
- if (!player.isOnline()) // Offline shops?
- continue;
- Index: java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
- ===================================================================
- --- java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java (revision 5101)
- +++ java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java (working copy)
- @@ -477,9 +477,8 @@
- {
- final NpcSay npcSay = new NpcSay(npc.getObjectId(), type, npc.getNpcId(), NpcStringId.getNpcStringId(messageId));
- int sourceRegion = MapRegionManager.getInstance().getMapRegion(npc.getX(), npc.getY()).getLocId();
- - final L2PcInstance[] charsInside = L2World.getInstance().getAllPlayersArray();
- - for(L2PcInstance pc : charsInside)
- + for(L2PcInstance pc : L2World.getInstance().getAllPlayers().valueCollection())
- if(pc != null && MapRegionManager.getInstance().getMapRegion(pc.getX(), pc.getY()).getLocId() == sourceRegion)
- pc.sendPacket(npcSay);
- }
- Index: java/com/l2jserver/gameserver/util/L2TIntObjectHashMap.java
- ===================================================================
- --- java/com/l2jserver/gameserver/util/L2TIntObjectHashMap.java (revision 5101)
- +++ java/com/l2jserver/gameserver/util/L2TIntObjectHashMap.java (working copy)
- @@ -20,6 +20,7 @@
- import gnu.trove.procedure.TIntProcedure;
- import gnu.trove.procedure.TObjectProcedure;
- +import java.util.Collection;
- import java.util.concurrent.locks.Lock;
- import java.util.concurrent.locks.ReentrantReadWriteLock;
- @@ -186,6 +187,20 @@
- }
- @Override
- + public Collection<V> valueCollection()
- + {
- + _readLock.lock();
- + try
- + {
- + return super.valueCollection();
- + }
- + finally
- + {
- + _readLock.unlock();
- + }
- + }
- +
- + @Override
- public int[] keys()
- {
- _readLock.lock();
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement