Removed stream usage from ItemCommissionManager.

This commit is contained in:
MobiusDevelopment
2023-01-08 14:17:59 +00:00
parent 6740c5c7e5
commit 82d5c63714
26 changed files with 858 additions and 468 deletions

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {

View File

@@ -25,6 +25,7 @@ import java.sql.Timestamp;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
@@ -32,7 +33,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
@@ -141,12 +141,18 @@ public class ItemCommissionManager
*/ */
public void showAuctions(Player player, Predicate<ItemTemplate> filter) public void showAuctions(Player player, Predicate<ItemTemplate> filter)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> filter.test(c.getItemInfo().getItem())) {
.limit(ITEMS_LIMIT_PER_REQUEST) if (filter.test(item.getItemInfo().getItem()))
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(item);
if (commissionItems.size() >= ITEMS_LIMIT_PER_REQUEST)
{
break;
}
}
}
if (commissionItems.isEmpty()) if (commissionItems.isEmpty())
{ {
@@ -172,12 +178,18 @@ public class ItemCommissionManager
*/ */
public void showPlayerAuctions(Player player) public void showPlayerAuctions(Player player)
{ {
//@formatter:off final List<CommissionItem> commissionItems = new LinkedList<>();
final List<CommissionItem> commissionItems = _commissionItems.values().stream() for (CommissionItem c : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.limit(MAX_ITEMS_REGISTRED_PER_PLAYER) if (c.getItemInstance().getOwnerId() == player.getObjectId())
.collect(Collectors.toList()); {
//@formatter:on commissionItems.add(c);
if (commissionItems.size() == MAX_ITEMS_REGISTRED_PER_PLAYER)
{
break;
}
}
}
if (!commissionItems.isEmpty()) if (!commissionItems.isEmpty())
{ {
@@ -227,11 +239,14 @@ public class ItemCommissionManager
synchronized (this) synchronized (this)
{ {
//@formatter:off long playerRegisteredItems = 0;
final long playerRegisteredItems = _commissionItems.values().stream() for (CommissionItem item : _commissionItems.values())
.filter(c -> c.getItemInstance().getOwnerId() == player.getObjectId()) {
.count(); if (item.getItemInstance().getOwnerId() == player.getObjectId())
//@formatter:on {
playerRegisteredItems++;
}
}
if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER) if (playerRegisteredItems >= MAX_ITEMS_REGISTRED_PER_PLAYER)
{ {