Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup: use bulk operation instead of iteration

Browse Source
This commit is contained in:
P0nk
2021-04-08 17:44:35 +02:00
parent 3434c7334b
commit 202f2d8bc5
16 changed files with 42 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/server/MakerItemFactory.java
View File

@@ -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;
/**
*
@@ -160,14 +161,10 @@ public class MakerItemFactory {
this.cost = mi.cost;
this.reqLevel = mi.reqLevel;
this.reqMakerLevel = mi.reqMakerLevel;
for(Pair<Integer, Integer> p : mi.reqItems) {
reqItems.add(p);
}
for(Pair<Integer, Integer> p : mi.gainItems) {
gainItems.add(p);
}
reqItems.addAll(mi.reqItems);
gainItems.addAll(mi.gainItems);
}
public List<Pair<Integer, Integer>> getReqItems() {

4
src/main/java/server/life/MaplePlayerNPC.java
View File

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

8
src/main/java/server/life/MobSkill.java
View File

@@ -62,9 +62,7 @@ public class MobSkill {
}
public void addSummons(List<Integer> toSummon) {
for (Integer summon : toSummon) {
this.toSummon.add(summon);
}
this.toSummon.addAll(toSummon);
}
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.add(chr);
}
banishPlayers.addAll(getPlayersInRange(monster));
} else {
banishPlayers.add(player);
}

6
src/main/java/server/maps/MapleHiredMerchant.java
View File

@@ -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.add(m);
}
msgList.addAll(messages);
return msgList;
}

20
src/main/java/server/maps/MaplePlayerShop.java
View File

@@ -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) {