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

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