cleanup: use bulk operation instead of iteration

src/main/java/net/server/Server.java

@@ -259,9 +259,7 @@ public class Server {
         try {
             List<Channel> channelz = new ArrayList<>();
             for (World world : this.getWorlds()) {
-                for (Channel ch : world.getChannels()) {
+                channelz.addAll(world.getChannels());
-                    channelz.add(ch);
-                }
             }
             return channelz;
         } catch (NullPointerException npe) {

src/main/java/net/server/channel/Channel.java

@@ -130,9 +130,7 @@ public final class Channel {
             acceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(new MapleCodecFactory()));
             acceptor.bind(new InetSocketAddress(port));
             ((SocketSessionConfig) acceptor.getSessionConfig()).setTcpNoDelay(true);
-            for (MapleExpeditionType exped : MapleExpeditionType.values()) {
+            expedType.addAll(Arrays.asList(MapleExpeditionType.values()));
-            	expedType.add(exped);
-            }
             
             if (Server.getInstance().isOnline()) {  // postpone event loading to improve boot time... thanks Riizade, daronhudson for noticing slow startup times
                 eventSM = new EventScriptManager(this, getEvents());

src/main/java/net/server/channel/handlers/UseOwlOfMinervaHandler.java

@@ -51,9 +51,7 @@ public final class UseOwlOfMinervaHandler extends AbstractMaplePacketHandler {
             Comparator<Pair<Integer, Integer>> comparator = (p1, p2) -> p2.getRight().compareTo(p1.getRight());
             
             PriorityQueue<Pair<Integer, Integer>> queue = new PriorityQueue<>(Math.max(1, owlSearched.size()), comparator);
-            for(Pair<Integer, Integer> p : owlSearched) {
+            queue.addAll(owlSearched);
-                queue.add(p);
-            }
             
             owlLeaderboards = new LinkedList<>();
             for(int i = 0; i < Math.min(owlSearched.size(), 10); i++) {

src/main/java/net/server/services/BaseScheduler.java

@@ -54,9 +54,7 @@ public abstract class BaseScheduler {
     protected BaseScheduler(MonitoredLockType lockType, List<MonitoredReentrantLock> extLocks) {
         schedulerLock = MonitoredReentrantLockFactory.createLock(lockType, true);
 
-        for(MonitoredReentrantLock lock : extLocks) {
+        externalLocks.addAll(extLocks);
-            externalLocks.add(lock);
-        }
     }
     
     protected void addListener(SchedulerListener listener) {

src/main/java/net/server/world/World.java

@@ -457,9 +457,7 @@ public class World {
     
     private static List<Entry<Integer, SortedMap<Integer, MapleCharacter>>> getSortedAccountCharacterView(Map<Integer, SortedMap<Integer, MapleCharacter>> map) {
         List<Entry<Integer, SortedMap<Integer, MapleCharacter>>> list = new ArrayList<>(map.size());
-        for(Entry<Integer, SortedMap<Integer, MapleCharacter>> e : map.entrySet()) {
+        list.addAll(map.entrySet());
-            list.add(e);
-        }
         
         list.sort((o1, o2) -> o1.getKey() - o2.getKey());
         
@@ -483,9 +481,7 @@ public class World {
         }
         
         for (Entry<Integer, SortedMap<Integer, MapleCharacter>> e : getSortedAccountCharacterView(accChars)) {
-            for (MapleCharacter chr : e.getValue().values()) {
+            chrList.addAll(e.getValue().values());
-                chrList.add(chr);
-            }
         }
         
         return chrList;
@@ -1359,9 +1355,7 @@ public class World {
         Comparator<Pair<Integer, Integer>> comparator = (p1, p2) -> p2.getRight().compareTo(p1.getRight());
 
         PriorityQueue<Pair<Integer, Integer>> queue = new PriorityQueue<>(Math.max(1, tabSellers.size()), comparator);
-        for(Pair<Integer, Integer> p : tabSellers) {
+        queue.addAll(tabSellers);
-            queue.add(p);
-        }
 
         tabLeaderboards = new LinkedList<>();
         for(int i = 0; i < Math.min(tabSellers.size(), 5); i++) {
@@ -1548,9 +1542,7 @@ public class World {
         List<MaplePlayerShop> psList = new ArrayList<>();
         activePlayerShopsLock.lock();
         try {
-            for(MaplePlayerShop mps : activePlayerShops.values()) {
+            psList.addAll(activePlayerShops.values());
-                psList.add(mps);
-            }
             
             return psList;
         } finally {

src/main/java/scripting/event/EventInstanceManager.java

@@ -944,9 +944,7 @@ public class EventInstanceManager {
                 
                 wL.lock();
                 try {
-                        for(Integer item: exclusive) {
+                    exclusiveItems.addAll(exclusive);
-                                exclusiveItems.add(item);
-                        }
                 } finally {
                         wL.unlock();
                 }

src/main/java/server/MakerItemFactory.java

@@ -23,11 +23,12 @@ package server;
 
 import config.YamlConfig;
 import constants.inventory.EquipType;
+import tools.Pair;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import tools.Pair;
 
 /**
  *
@@ -161,13 +162,9 @@ public class MakerItemFactory {
             this.reqLevel = mi.reqLevel;
             this.reqMakerLevel = mi.reqMakerLevel;
 
-            for(Pair<Integer, Integer> p : mi.reqItems) {
+            reqItems.addAll(mi.reqItems);
-                reqItems.add(p);
-            }
 
-            for(Pair<Integer, Integer> p : mi.gainItems) {
+            gainItems.addAll(mi.gainItems);
-                gainItems.add(p);
-            }
         }
 
         public List<Pair<Integer, Integer>> getReqItems() {

src/main/java/server/life/MaplePlayerNPC.java

@@ -514,9 +514,7 @@ public class MaplePlayerNPC extends AbstractMapleMapObject {
             e.printStackTrace();
         }
 
-        for (Integer i : updateMapids) {
+        mapids.addAll(updateMapids);
-            mapids.add(i);
-        }
 
         return mapids;
     }

src/main/java/server/life/MobSkill.java

@@ -62,9 +62,7 @@ public class MobSkill {
     }
 
     public void addSummons(List<Integer> toSummon) {
-        for (Integer summon : toSummon) {
+        this.toSummon.addAll(toSummon);
-            this.toSummon.add(summon);
-        }
     }
 
     public void setSpawnEffect(int spawnEffect) {
@@ -186,9 +184,7 @@ public class MobSkill {
                 break;
             case 129: // Banish
                 if (lt != null && rb != null && skill) {
-                    for (MapleCharacter chr : getPlayersInRange(monster)) {
+                    banishPlayers.addAll(getPlayersInRange(monster));
-                        banishPlayers.add(chr);
-                    }
                 } else {
                     banishPlayers.add(player);
                 }

src/main/java/server/maps/MapleHiredMerchant.java

@@ -609,7 +609,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
         if(!open.get()) return list;
         
         synchronized (items) {
-            for(MaplePlayerShopItem mpsi : items) all.add(mpsi);
+            all.addAll(items);
         }
         
         for(MaplePlayerShopItem mpsi : all) {
@@ -679,9 +679,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
     public List<Pair<String, Byte>> getMessages() {
         synchronized (messages) {
             List<Pair<String, Byte>> msgList = new LinkedList<>();
-            for(Pair<String, Byte> m : messages) {
+            msgList.addAll(messages);
-                msgList.add(m);
-            }
             
             return msgList;
         }

src/main/java/server/maps/MaplePlayerShop.java

@@ -28,21 +28,17 @@ import client.inventory.MapleInventory;
 import client.inventory.MapleInventoryType;
 import client.inventory.manipulator.MapleInventoryManipulator;
 import client.inventory.manipulator.MapleKarmaManipulator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.Lock;
 import net.opcodes.SendOpcode;
-import tools.MaplePacketCreator;
-import tools.Pair;
-import tools.data.output.MaplePacketLittleEndianWriter;
 import net.server.audit.locks.MonitoredLockType;
 import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
 import server.MapleTrade;
+import tools.MaplePacketCreator;
+import tools.Pair;
+import tools.data.output.MaplePacketLittleEndianWriter;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Lock;
 
 /**
  *
@@ -556,7 +552,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
         List<MaplePlayerShopItem> all = new ArrayList<>();
         
         synchronized (items) {
-            for(MaplePlayerShopItem mpsi : items) all.add(mpsi);
+            all.addAll(items);
         }
         
         for(MaplePlayerShopItem mpsi : all) {

tools/MapleArrowFetcher/src/life/MapleMonsterStats.java

@@ -21,17 +21,13 @@
 */
 package life;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 import life.MapleLifeFactory.BanishInfo;
 import life.MapleLifeFactory.loseItem;
 import life.MapleLifeFactory.selfDestruction;
 import tools.Pair;
 
+import java.util.*;
+
 /**
  * @author Frz
  */
@@ -193,9 +189,7 @@ public class MapleMonsterStats {
     }
 
     public void setSkills(List<Pair<Integer, Integer>> skills) {
-        for (Pair<Integer, Integer> skill : skills) {
+        this.skills.addAll(skills);
-            this.skills.add(skill);
-        }
     }
 
     public List<Pair<Integer, Integer>> getSkills() {

tools/MapleCashCosmeticsChecker/src/maplecashcosmeticschecker/MapleCashCosmeticsChecker.java

@@ -578,9 +578,7 @@ public class MapleCashCosmeticsChecker {
         List<Pair<Pair<Integer, String>, List<Integer>>> list = new ArrayList<>(map.size());
         for(Entry<Pair<Integer, String>, Set<Integer>> e : map.entrySet()) {
             List<Integer> il = new ArrayList<>(2);
-            for(Integer i : e.getValue()) {
+            il.addAll(e.getValue());
-                il.add(i);
-            }
             
             Collections.sort(il, (o1, o2) -> o1 - o2);
             

tools/MapleMesoFetcher/src/life/MapleMonsterStats.java

@@ -21,17 +21,13 @@
 */
 package life;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 import life.MapleLifeFactory.BanishInfo;
 import life.MapleLifeFactory.loseItem;
 import life.MapleLifeFactory.selfDestruction;
 import tools.Pair;
 
+import java.util.*;
+
 /**
  * @author Frz
  */
@@ -193,9 +189,7 @@ public class MapleMonsterStats {
     }
 
     public void setSkills(List<Pair<Integer, Integer>> skills) {
-        for (Pair<Integer, Integer> skill : skills) {
+        this.skills.addAll(skills);
-            this.skills.add(skill);
-        }
     }
 
     public List<Pair<Integer, Integer>> getSkills() {

tools/MapleQuestItemFetcher/src/maplequestitemfetcher/MapleQuestItemFetcher.java

@@ -411,9 +411,7 @@ public class MapleQuestItemFetcher {
     
     private static List<Entry<Integer, Integer>> getSortedMapEntries0(Map<Integer, Integer> map) {
         List<Entry<Integer, Integer>> list = new ArrayList<>(map.size());
-        for(Entry<Integer, Integer> e : map.entrySet()) {
+        list.addAll(map.entrySet());
-            list.add(e);
-        }
         
         Collections.sort(list, (o1, o2) -> o1.getKey() - o2.getKey());
         
@@ -422,9 +420,7 @@ public class MapleQuestItemFetcher {
     
     private static List<Entry<Integer, int[]>> getSortedMapEntries1(Map<Integer, int[]> map) {
         List<Entry<Integer, int[]>> list = new ArrayList<>(map.size());
-        for(Entry<Integer, int[]> e : map.entrySet()) {
+        list.addAll(map.entrySet());
-            list.add(e);
-        }
         
         Collections.sort(list, (o1, o2) -> o1.getKey() - o2.getKey());
         
@@ -435,9 +431,7 @@ public class MapleQuestItemFetcher {
         List<Pair<Integer, List<Integer>>> list = new ArrayList<>(map.size());
         for(Entry<Integer, Set<Integer>> e : map.entrySet()) {
             List<Integer> il = new ArrayList<>(2);
-            for(Integer i : e.getValue()) {
+            il.addAll(e.getValue());
-                il.add(i);
-            }
             
             Collections.sort(il, (o1, o2) -> o1 - o2);
             

tools/MapleSkillbookChanceFetcher/src/life/MapleMonsterStats.java

@@ -21,17 +21,13 @@
 */
 package life;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 import life.MapleLifeFactory.BanishInfo;
 import life.MapleLifeFactory.loseItem;
 import life.MapleLifeFactory.selfDestruction;
 import tools.Pair;
 
+import java.util.*;
+
 /**
  * @author Frz
  */
@@ -193,9 +189,7 @@ public class MapleMonsterStats {
     }
 
     public void setSkills(List<Pair<Integer, Integer>> skills) {
-        for (Pair<Integer, Integer> skill : skills) {
+        this.skills.addAll(skills);
-            this.skills.add(skill);
-        }
     }
 
     public List<Pair<Integer, Integer>> getSkills() {