API tools faq
paste
Advertisement
Nik

Dp part for core [4793]

Nik
Aug 4th, 2011
129
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 18.98 KB | None | 0 0
raw download clone embed print report
  1. Index: /trunk/datapack_development/data/scripts/handlers/chathandlers/ChatBattlefield.java
  2. ===================================================================
  3. --- /trunk/datapack_development/data/scripts/handlers/chathandlers/ChatBattlefield.java (revision 788)
  4. +++ /trunk/datapack_development/data/scripts/handlers/chathandlers/ChatBattlefield.java (revision 941)
  5. @@ -13,8 +13,6 @@
  6.   * this program. If not, see <http://www.gnu.org/licenses/>.
  7.   */
  8.  package handlers.chathandlers;
  9. -
  10. -import java.util.Collection;
  11.  
  12.  import com.l2jserver.gameserver.handler.IChatHandler;
  13.  import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
  14. @@ -43,8 +41,7 @@
  15.         if (TerritoryWarManager.getInstance().isTWChannelOpen() && activeChar.getSiegeSide() > 0)
  16.         {
  17.             CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text);
  18. -           Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers().values();
  19. -           for (L2PcInstance player : pls)
  20. +           for (L2PcInstance player : L2World.getInstance().getAllPlayersArray())
  21.                 if (player.getSiegeSide() == activeChar.getSiegeSide())
  22.                     player.sendPacket(cs);
  23.         }
  24. Index: /trunk/datapack_development/data/scripts/handlers/chathandlers/ChatTrade.java
  25. ===================================================================
  26. --- /trunk/datapack_development/data/scripts/handlers/chathandlers/ChatTrade.java   (revision 788)
  27. +++ /trunk/datapack_development/data/scripts/handlers/chathandlers/ChatTrade.java   (revision 941)
  28. @@ -13,8 +13,6 @@
  29.   * this program. If not, see <http://www.gnu.org/licenses/>.
  30.   */
  31.  package handlers.chathandlers;
  32. -
  33. -import java.util.Collection;
  34.  
  35.  import com.l2jserver.Config;
  36.  import com.l2jserver.gameserver.datatables.MapRegionTable;
  37. @@ -45,12 +43,10 @@
  38.     {
  39.         CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text);
  40.        
  41. -       Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers().values();
  42. -      
  43.         if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.isGM()))
  44.         {
  45.             int region = MapRegionTable.getInstance().getMapRegion(activeChar.getX(), activeChar.getY());
  46. -           for (L2PcInstance player : pls)
  47. +           for (L2PcInstance player : L2World.getInstance().getAllPlayersArray())
  48.             {
  49.                 if (region == MapRegionTable.getInstance().getMapRegion(player.getX(), player.getY()) && !BlockList.isBlocked(player, activeChar) && player.getInstanceId() == activeChar.getInstanceId())
  50.                     player.sendPacket(cs);
  51. @@ -64,7 +60,7 @@
  52.                 return;
  53.             }
  54.            
  55. -           for (L2PcInstance player : pls)
  56. +           for (L2PcInstance player : L2World.getInstance().getAllPlayersArray())
  57.             {
  58.                 if (!BlockList.isBlocked(player, activeChar))
  59.                     player.sendPacket(cs);
  60. Index: /trunk/datapack_development/data/scripts/handlers/chathandlers/ChatShout.java
  61. ===================================================================
  62. --- /trunk/datapack_development/data/scripts/handlers/chathandlers/ChatShout.java   (revision 788)
  63. +++ /trunk/datapack_development/data/scripts/handlers/chathandlers/ChatShout.java   (revision 941)
  64. @@ -13,8 +13,6 @@
  65.   * this program. If not, see <http://www.gnu.org/licenses/>.
  66.   */
  67.  package handlers.chathandlers;
  68. -
  69. -import java.util.Collection;
  70.  
  71.  import com.l2jserver.Config;
  72.  import com.l2jserver.gameserver.datatables.MapRegionTable;
  73. @@ -45,12 +43,10 @@
  74.     {
  75.         CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text);
  76.        
  77. -       Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers().values();
  78. -      
  79.         if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.isGM()))
  80.         {
  81.             int region = MapRegionTable.getInstance().getMapRegion(activeChar.getX(), activeChar.getY());
  82. -           for (L2PcInstance player : pls)
  83. +           for (L2PcInstance player : L2World.getInstance().getAllPlayersArray())
  84.             {
  85.                 if (region == MapRegionTable.getInstance().getMapRegion(player.getX(), player.getY()) && !BlockList.isBlocked(player, activeChar) && player.getInstanceId() == activeChar.getInstanceId())
  86.                     player.sendPacket(cs);
  87. @@ -64,7 +60,7 @@
  88.                 return;
  89.             }
  90.            
  91. -           for (L2PcInstance player : pls)
  92. +           for (L2PcInstance player : L2World.getInstance().getAllPlayersArray())
  93.             {
  94.                 if (!BlockList.isBlocked(player, activeChar))
  95.                     player.sendPacket(cs);
  96. Index: /trunk/datapack_development/data/scripts/handlers/chathandlers/ChatHeroVoice.java
  97. ===================================================================
  98. --- /trunk/datapack_development/data/scripts/handlers/chathandlers/ChatHeroVoice.java   (revision 788)
  99. +++ /trunk/datapack_development/data/scripts/handlers/chathandlers/ChatHeroVoice.java   (revision 941)
  100. @@ -13,8 +13,6 @@
  101.   * this program. If not, see <http://www.gnu.org/licenses/>.
  102.   */
  103.  package handlers.chathandlers;
  104. -
  105. -import java.util.Collection;
  106.  
  107.  import com.l2jserver.gameserver.handler.IChatHandler;
  108.  import com.l2jserver.gameserver.model.BlockList;
  109. @@ -50,8 +48,7 @@
  110.             }
  111.             CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text);
  112.            
  113. -           Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers().values();
  114. -           for (L2PcInstance player : pls)
  115. +           for (L2PcInstance player : L2World.getInstance().getAllPlayersArray())
  116.             {
  117.                 if (player != null && !BlockList.isBlocked(player, activeChar))
  118.                     player.sendPacket(cs);
  119. Index: /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminGmChat.java
  120. ===================================================================
  121. --- /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminGmChat.java (revision 318)
  122. +++ /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminGmChat.java (revision 941)
  123. @@ -13,8 +13,6 @@
  124.   * this program. If not, see <http://www.gnu.org/licenses/>.
  125.   */
  126.  package handlers.admincommandhandlers;
  127. -
  128. -import java.util.Collection;
  129.  
  130.  import com.l2jserver.Config;
  131.  import com.l2jserver.gameserver.GmListTable;
  132. @@ -151,12 +149,11 @@
  133.                {
  134.                    text = text.substring(1);
  135.                    cs = new CreatureSay(player.getObjectId(), Say2.SHOUT, target.getName(), text);
  136. -                  Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers().values();
  137.                
  138.                    if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.isGM()))
  139.                    {
  140.                        int region = MapRegionTable.getInstance().getMapRegion(player.getX(), player.getY());
  141. -                      for (L2PcInstance plr : pls)
  142. +                      for (L2PcInstance plr : L2World.getInstance().getAllPlayersArray())
  143.                        {
  144.                            if (region == MapRegionTable.getInstance().getMapRegion(plr.getX(), plr.getY()) && !BlockList.isBlocked(plr, player) && plr.getInstanceId() == player.getInstanceId())
  145.                                plr.sendPacket(cs);
  146. @@ -165,7 +162,7 @@
  147.                    else if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("global"))
  148.                    {
  149.                    
  150. -                      for (L2PcInstance plr : pls)
  151. +                      for (L2PcInstance plr : L2World.getInstance().getAllPlayersArray())
  152.                        {
  153.                            if (!BlockList.isBlocked(plr, player))
  154.                                plr.sendPacket(cs);
  155. @@ -176,12 +173,11 @@
  156.                {
  157.                    text = text.substring(1);
  158.                    cs = new CreatureSay(player.getObjectId(), Say2.TRADE, target.getName(), text);
  159. -                  Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers().values();
  160.                
  161.                    if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.isGM()))
  162.                    {
  163.                        int region = MapRegionTable.getInstance().getMapRegion(player.getX(), player.getY());
  164. -                      for (L2PcInstance plr : pls)
  165. +                      for (L2PcInstance plr : L2World.getInstance().getAllPlayersArray())
  166.                        {
  167.                            if (region == MapRegionTable.getInstance().getMapRegion(plr.getX(), plr.getY()) && !BlockList.isBlocked(plr, player) && plr.getInstanceId() == player.getInstanceId())
  168.                                plr.sendPacket(cs);
  169. @@ -190,7 +186,7 @@
  170.                    else if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("global"))
  171.                    {
  172.                    
  173. -                      for (L2PcInstance plr : pls)
  174. +                      for (L2PcInstance plr : L2World.getInstance().getAllPlayersArray())
  175.                        {
  176.                            if (!BlockList.isBlocked(plr, player))
  177.                                plr.sendPacket(cs);
  178. @@ -221,8 +217,7 @@
  179.                    if (player.isHero())
  180.                    {
  181.                        cs = new CreatureSay(player.getObjectId(), Say2.HERO_VOICE, player.getName(), text);
  182. -                      Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers().values();
  183. -                      for (L2PcInstance plr : pls)
  184. +                      for (L2PcInstance plr : L2World.getInstance().getAllPlayersArray())
  185.                            plr.sendPacket(cs);
  186.                    }
  187.                }
  188. Index: /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
  189. ===================================================================
  190. --- /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminEditChar.java   (revision 753)
  191. +++ /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminEditChar.java   (revision 941)
  192. @@ -18,7 +18,6 @@
  193.  import java.sql.PreparedStatement;
  194.  import java.util.ArrayList;
  195.  import java.util.Arrays;
  196. -import java.util.Collection;
  197.  import java.util.Collections;
  198.  import java.util.Comparator;
  199.  import java.util.HashMap;
  200. @@ -773,12 +772,7 @@
  201.    
  202.     private void listCharacters(L2PcInstance activeChar, int page)
  203.     {
  204. -       Collection<L2PcInstance> allPlayers = L2World.getInstance().getAllPlayers().values();
  205. -       L2PcInstance[] players;
  206. -       //synchronized (L2World.getInstance().getAllPlayers())
  207. -       {
  208. -           players = allPlayers.toArray(new L2PcInstance[allPlayers.size()]);
  209. -       }
  210. +       L2PcInstance[] players = L2World.getInstance().getAllPlayersArray();
  211.        
  212.         int maxCharactersPerPage = 20;
  213.         int maxPages = players.length / maxCharactersPerPage;
  214. @@ -1053,12 +1047,7 @@
  215.     {
  216.         int CharactersFound = 0;
  217.         String name;
  218. -       Collection<L2PcInstance> allPlayers = L2World.getInstance().getAllPlayers().values();
  219. -       L2PcInstance[] players;
  220. -       //synchronized (L2World.getInstance().getAllPlayers())
  221. -       {
  222. -           players = allPlayers.toArray(new L2PcInstance[allPlayers.size()]);
  223. -       }
  224. +       L2PcInstance[] players = L2World.getInstance().getAllPlayersArray();
  225.         NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
  226.         adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/charfind.htm");
  227.        
  228. @@ -1121,12 +1110,7 @@
  229.             if (!IpAdress.matches("^(?:(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2(?:[0-4][0-9]|5[0-5]))\\.){3}(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2(?:[0-4][0-9]|5[0-5]))$"))
  230.                 throw new IllegalArgumentException("Malformed IPv4 number");
  231.         }
  232. -       Collection<L2PcInstance> allPlayers = L2World.getInstance().getAllPlayers().values();
  233. -       L2PcInstance[] players;
  234. -       //synchronized (L2World.getInstance().getAllPlayers())
  235. -       {
  236. -           players = allPlayers.toArray(new L2PcInstance[allPlayers.size()]);
  237. -       }
  238. +       L2PcInstance[] players = L2World.getInstance().getAllPlayersArray();
  239.         int CharactersFound = 0;
  240.         L2GameClient client;
  241.         String name, ip = "0.0.0.0";
  242. @@ -1236,8 +1220,7 @@
  243.      */
  244.     private void findDualbox(L2PcInstance activeChar, int multibox)
  245.     {
  246. -       Collection<L2PcInstance> allPlayers = L2World.getInstance().getAllPlayers().values();
  247. -       L2PcInstance[] players = allPlayers.toArray(new L2PcInstance[allPlayers.size()]);
  248. +       L2PcInstance[] players = L2World.getInstance().getAllPlayersArray();
  249.        
  250.         Map<String, List<L2PcInstance>> ipMap = new HashMap<String, List<L2PcInstance>>();
  251.        
  252. @@ -1294,8 +1277,7 @@
  253.    
  254.     private void findDualboxStrict(L2PcInstance activeChar, int multibox)
  255.     {
  256. -       Collection<L2PcInstance> allPlayers = L2World.getInstance().getAllPlayers().values();
  257. -       L2PcInstance[] players = allPlayers.toArray(new L2PcInstance[allPlayers.size()]);
  258. +       L2PcInstance[] players = L2World.getInstance().getAllPlayersArray();
  259.        
  260.         Map<IpPack, List<L2PcInstance>> ipMap = new HashMap<IpPack, List<L2PcInstance>>();
  261.        
  262. Index: /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java
  263. ===================================================================
  264. --- /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java  (revision 2)
  265. +++ /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java  (revision 941)
  266. @@ -14,7 +14,6 @@
  267.   */
  268.  package handlers.admincommandhandlers;
  269.  
  270. -import java.util.Collection;
  271.  import java.util.List;
  272.  import java.util.StringTokenizer;
  273.  
  274. @@ -81,10 +80,9 @@
  275.         }
  276.         else if (command.equals("admin_announce_announcements"))
  277.         {
  278. -           Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers().values();
  279.             // synchronized (L2World.getInstance().getAllPlayers())
  280.             {
  281. -               for (L2PcInstance player : pls)
  282. +               for (L2PcInstance player : L2World.getInstance().getAllPlayersArray())
  283.                     Announcements.getInstance().showAnnouncements(player);
  284.             }
  285.             Announcements.getInstance().listAnnouncements(activeChar);
  286. Index: /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
  287. ===================================================================
  288. --- /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminBuffs.java  (revision 677)
  289. +++ /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminBuffs.java  (revision 941)
  290. @@ -177,7 +177,7 @@
  291.                     e.printStackTrace();
  292.                 }
  293.                
  294. -               for (L2PcInstance player : L2World.getInstance().getAllPlayers().values())
  295. +               for (L2PcInstance player : L2World.getInstance().getAllPlayersArray())
  296.                 {
  297.                     if (player != null)
  298.                         SkillTable.getInstance().getInfo(id, level).getEffects(player, player);
  299. Index: /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminKick.java
  300. ===================================================================
  301. --- /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminKick.java   (revision 786)
  302. +++ /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminKick.java   (revision 941)
  303. @@ -14,7 +14,6 @@
  304.   */
  305.  package handlers.admincommandhandlers;
  306.  
  307. -import java.util.Collection;
  308.  import java.util.StringTokenizer;
  309.  
  310.  import com.l2jserver.gameserver.handler.IAdminCommandHandler;
  311. @@ -47,10 +46,9 @@
  312.         if (command.startsWith("admin_kick_non_gm"))
  313.         {
  314.             int counter = 0;
  315. -           Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers().values();
  316.             //synchronized (L2World.getInstance().getAllPlayers())
  317.             {
  318. -               for (L2PcInstance player : pls)
  319. +               for (L2PcInstance player : L2World.getInstance().getAllPlayersArray())
  320.                     if (!player.isGM())
  321.                     {
  322.                         counter++;
  323. Index: /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java
  324. ===================================================================
  325. --- /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java (revision 525)
  326. +++ /trunk/datapack_development/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java (revision 941)
  327. @@ -278,16 +278,14 @@
  328.                 activeChar.sendMessage("This item does not stack - Creation aborted.");
  329.                 return false;
  330.             }
  331. -           Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers().values();
  332. -           {
  333. -               for (L2PcInstance onlinePlayer : pls)
  334. -               {
  335. -                   if (activeChar != onlinePlayer && onlinePlayer.isOnline() && (onlinePlayer.getClient() != null && !onlinePlayer.getClient().isDetached()))
  336. -                   {
  337. -                       onlinePlayer.getInventory().addItem("Admin", idval, numval, onlinePlayer, activeChar);
  338. -                       onlinePlayer.sendMessage("Admin spawned "+numval+" "+template.getName()+" in your inventory.");
  339. -                       counter++;
  340. -                   }
  341. +
  342. +           for (L2PcInstance onlinePlayer : L2World.getInstance().getAllPlayersArray())
  343. +           {
  344. +               if (activeChar != onlinePlayer && onlinePlayer.isOnline() && (onlinePlayer.getClient() != null && !onlinePlayer.getClient().isDetached()))
  345. +               {
  346. +                   onlinePlayer.getInventory().addItem("Admin", idval, numval, onlinePlayer, activeChar);
  347. +                   onlinePlayer.sendMessage("Admin spawned " + numval + " " + template.getName() + " in your inventory.");
  348. +                   counter++;
  349.                 }
  350.             }
  351.             activeChar.sendMessage(counter +" players rewarded with " + template.getName());
  352. Index: /trunk/datapack_development/data/scripts/events/SavingSanta/SavingSanta.java
  353. ===================================================================
  354. --- /trunk/datapack_development/data/scripts/events/SavingSanta/SavingSanta.java    (revision 723)
  355. +++ /trunk/datapack_development/data/scripts/events/SavingSanta/SavingSanta.java    (revision 941)
  356. @@ -293,7 +293,7 @@
  357.                 if (isSantaFree)
  358.                 {
  359.                     startQuestTimer("SantaSpawn", 120000, null, null);
  360. -                   for (L2PcInstance pl : L2World.getInstance().getAllPlayers().values())
  361. +                   for (L2PcInstance pl : L2World.getInstance().getAllPlayersArray())
  362.                     {
  363.                         if (pl.isOnline() && pl.getLevel() >= 20 && pl.isInCombat() && !pl.isInsideZone(L2Character.ZONE_PEACE) && !pl.isFlyingMounted())
  364.                         {
  365. Index: /trunk/datapack_development/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
  366. ===================================================================
  367. --- /trunk/datapack_development/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java (revision 2)
  368. +++ /trunk/datapack_development/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java (revision 941)
  369. @@ -130,7 +130,7 @@
  370.         {
  371.             int territoryId = getTerritoryIdForThisNPCId(npc.getNpcId());
  372.             if (territoryId >= 81 && territoryId <= 89)
  373. -               for(L2PcInstance pl : L2World.getInstance().getAllPlayers().values())
  374. +               for(L2PcInstance pl : L2World.getInstance().getAllPlayersArray())
  375.                     if (pl.getSiegeSide() == territoryId)
  376.                     {
  377.                         QuestState st = pl.getQuestState(getName());
  378. @@ -404,7 +404,7 @@
  379.     {
  380.         super.setOnEnterWorld(val);
  381.        
  382. -       for(L2PcInstance player: L2World.getInstance().getAllPlayers().values())
  383. +       for(L2PcInstance player: L2World.getInstance().getAllPlayersArray())
  384.             if (player.getSiegeSide() > 0)
  385.             {
  386.                 TerritoryWarSuperClass territoryQuest = _forTheSakeScripts.get(player.getSiegeSide());
  387. Index: /trunk/datapack_development/data/scripts/ai/individual/Antharas.java
  388. ===================================================================
  389. --- /trunk/datapack_development/data/scripts/ai/individual/Antharas.java    (revision 693)
  390. +++ /trunk/datapack_development/data/scripts/ai/individual/Antharas.java    (revision 941)
  391. @@ -794,7 +794,7 @@
  392.         {
  393.             GrandBossManager.getInstance().setBossStatus(_bossId,DORMANT);
  394.             if (FWA_DOSERVEREARTHQUAKE)
  395. -               for(L2PcInstance p : L2World.getInstance().getAllPlayers().values())
  396. +               for(L2PcInstance p : L2World.getInstance().getAllPlayersArray())
  397.                     p.broadcastPacket(new Earthquake(185708,114298,-8221,20,10));
  398.         }
  399.     }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!