Advertisement
Nik

getAllPlayersArray alternative

Nik
Dec 12th, 2011
196
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 5.05 KB | None | 0 0
  1. Index: java/com/l2jserver/gameserver/LoginServerThread.java
  2. ===================================================================
  3. --- java/com/l2jserver/gameserver/LoginServerThread.java    (revision 5101)
  4. +++ java/com/l2jserver/gameserver/LoginServerThread.java    (working copy)
  5. @@ -295,7 +295,7 @@
  6.                             if (L2World.getInstance().getAllPlayersCount() > 0)
  7.                             {
  8.                                 FastList<String> playerList = new FastList<String>();
  9. -                               for (L2PcInstance player : L2World.getInstance().getAllPlayersArray())
  10. +                               for (L2PcInstance player : L2World.getInstance().getAllPlayers().valueCollection())
  11.                                 {
  12.                                     playerList.add(player.getAccountName());
  13.                                 }
  14. Index: java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java
  15. ===================================================================
  16. --- java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java    (revision 5101)
  17. +++ java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java    (working copy)
  18. @@ -273,7 +273,7 @@
  19.     public/*synchronized */void changeCommunityBoard()
  20.     {
  21.         FastList<L2PcInstance> sortedPlayers = new FastList<L2PcInstance>();
  22. -       Collections.addAll(sortedPlayers, L2World.getInstance().getAllPlayersArray());
  23. +       sortedPlayers.addAll(L2World.getInstance().getAllPlayers().valueCollection());
  24.         Collections.sort(sortedPlayers, new Comparator<L2PcInstance>()
  25.         {
  26.             @Override
  27. Index: java/com/l2jserver/gameserver/datatables/OfflineTradersTable.java
  28. ===================================================================
  29. --- java/com/l2jserver/gameserver/datatables/OfflineTradersTable.java   (revision 5101)
  30. +++ java/com/l2jserver/gameserver/datatables/OfflineTradersTable.java   (working copy)
  31. @@ -62,7 +62,7 @@
  32.             PreparedStatement stm_items = con.prepareStatement(SAVE_ITEMS);
  33.            
  34.             //TextBuilder items = TextBuilder.newInstance();
  35. -           for (L2PcInstance pc : L2World.getInstance().getAllPlayersArray())
  36. +           for (L2PcInstance pc : L2World.getInstance().getAllPlayers().valueCollection())
  37.             {
  38.                 try
  39.                 {
  40. Index: java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java
  41. ===================================================================
  42. --- java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java  (revision 5101)
  43. +++ java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java  (working copy)
  44. @@ -1120,7 +1120,7 @@
  45.         {
  46.             if (isTWInProgress())
  47.             {
  48. -               for(L2PcInstance player : L2World.getInstance().getAllPlayersArray())
  49. +               for(L2PcInstance player : L2World.getInstance().getAllPlayers().valueCollection())
  50.                     if (player != null && player.getSiegeSide() > 0)
  51.                         giveTWPoint(player, 1000, 6);
  52.             }
  53. Index: java/com/l2jserver/gameserver/model/entity/L2Event.java
  54. ===================================================================
  55. --- java/com/l2jserver/gameserver/model/entity/L2Event.java (revision 5101)
  56. +++ java/com/l2jserver/gameserver/model/entity/L2Event.java (working copy)
  57. @@ -372,7 +372,7 @@
  58.             _eventInfo = inbr.readLine();
  59.            
  60.             List<L2PcInstance> temp = new FastList<L2PcInstance>();
  61. -           for (L2PcInstance player : L2World.getInstance().getAllPlayersArray())
  62. +           for (L2PcInstance player : L2World.getInstance().getAllPlayers().valueCollection())
  63.             {
  64.                 if (!player.isOnline()) // Offline shops?
  65.                     continue;
  66. Index: java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
  67. ===================================================================
  68. --- java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java    (revision 5101)
  69. +++ java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java    (working copy)
  70. @@ -477,9 +477,8 @@
  71.     {
  72.         final NpcSay npcSay = new NpcSay(npc.getObjectId(), type, npc.getNpcId(), NpcStringId.getNpcStringId(messageId));
  73.         int sourceRegion = MapRegionManager.getInstance().getMapRegion(npc.getX(), npc.getY()).getLocId();
  74. -       final L2PcInstance[] charsInside = L2World.getInstance().getAllPlayersArray();
  75.        
  76. -       for(L2PcInstance pc : charsInside)
  77. +       for(L2PcInstance pc : L2World.getInstance().getAllPlayers().valueCollection())
  78.             if(pc != null && MapRegionManager.getInstance().getMapRegion(pc.getX(), pc.getY()).getLocId() == sourceRegion)
  79.                 pc.sendPacket(npcSay);
  80.     }
  81. Index: java/com/l2jserver/gameserver/util/L2TIntObjectHashMap.java
  82. ===================================================================
  83. --- java/com/l2jserver/gameserver/util/L2TIntObjectHashMap.java (revision 5101)
  84. +++ java/com/l2jserver/gameserver/util/L2TIntObjectHashMap.java (working copy)
  85. @@ -20,6 +20,7 @@
  86.  import gnu.trove.procedure.TIntProcedure;
  87.  import gnu.trove.procedure.TObjectProcedure;
  88.  
  89. +import java.util.Collection;
  90.  import java.util.concurrent.locks.Lock;
  91.  import java.util.concurrent.locks.ReentrantReadWriteLock;
  92.  
  93. @@ -186,6 +187,20 @@
  94.     }
  95.    
  96.     @Override
  97. +   public Collection<V> valueCollection()
  98. +   {
  99. +       _readLock.lock();
  100. +       try
  101. +       {
  102. +           return super.valueCollection();
  103. +       }
  104. +       finally
  105. +       {
  106. +           _readLock.unlock();
  107. +       }
  108. +   }
  109. +  
  110. +   @Override
  111.     public int[] keys()
  112.     {
  113.         _readLock.lock();
  114.  
  115.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement