diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 47acbd9a27..fc6763162c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 47acbd9a27..fc6763162c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 47acbd9a27..fc6763162c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 47acbd9a27..fc6763162c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 47acbd9a27..fc6763162c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 32c33c31e4..82645b627a 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 493562a049..81849ea39b 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0fc96c33c7..65411d6c15 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 5bd1f48239..04c47c0aa1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 32c33c31e4..82645b627a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) { diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 16464c78a2..6aa5981dfe 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -25,6 +25,7 @@ import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; @@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -141,12 +141,18 @@ public class ItemCommissionManager */ public void showAuctions(Player player, Predicate filter) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> filter.test(c.getItemInfo().getItem())) - .limit(ITEMS_LIMIT_PER_REQUEST) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem item : _commissionItems.values()) + { + if (filter.test(item.getItemInfo().getItem())) + { + commissionItems.add(item); + if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST) + { + break; + } + } + } if (commissionItems.isEmpty()) { @@ -172,12 +178,18 @@ public class ItemCommissionManager */ public void showPlayerAuctions(Player player) { - //@formatter:off - final List commissionItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .limit(MAX_ITEMS_REGISTRED_PER_PLAYER) - .collect(Collectors.toList()); - //@formatter:on + final List commissionItems = new LinkedList<>(); + for (CommissionItem c : _commissionItems.values()) + { + if (c.getItemInstance().getOwnerId() == player.getObjectId()) + { + commissionItems.add(c); + if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER) + { + break; + } + } + } if (!commissionItems.isEmpty()) { @@ -227,11 +239,14 @@ public class ItemCommissionManager synchronized (this) { - //@formatter:off - final long playerRegisteredItems = _commissionItems.values().stream() - .filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) - .count(); - //@formatter:on + long playerRegisteredItems = 0; + for (CommissionItem item : _commissionItems.values()) + { + if (item.getItemInstance().getOwnerId() == player.getObjectId()) + { + playerRegisteredItems++; + } + } if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) {