lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed stream usage from ClanEntryManager.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-01-08 14:14:40 +00:00
parent caf264829f
commit 6740c5c7e5
26 changed files with 598 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)

40
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
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;
@@ -341,14 +340,17 @@ public class ClanEntryManager
public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
final List<PledgeWaitingInfo> result = new ArrayList<>();
// TODO: Handle Role for (PledgeWaitingInfo p : _waitingList.values())
//@formatter:off {
return _waitingList.values().stream() // TODO: Handle Role.
.filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))
.sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) {
.collect(Collectors.toList()); result.add(p);
//@formatter:on }
}
result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy));
return result;
} }
public List<PledgeWaitingInfo> queryWaitingListByName(String name) public List<PledgeWaitingInfo> queryWaitingListByName(String name)
@@ -407,19 +409,23 @@ public class ClanEntryManager
public List<PledgeRecruitInfo> getUnSortedClanList() public List<PledgeRecruitInfo> getUnSortedClanList()
{ {
return _clanList.values().stream().collect(Collectors.toList()); return new ArrayList<>(_clanList.values());
} }
public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
{ {
final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
final List<PledgeRecruitInfo> sortedList = new ArrayList<>(_clanList.values());
//@formatter:off for (int i = 0; i < sortedList.size(); i++)
return _clanList.values().stream() {
.filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma())))))) final PledgeRecruitInfo currentInfo = sortedList.get(i);
.sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) if (((clanLevel < 0) && (karma >= 0) && (karma != currentInfo.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (currentInfo.getClan() != null ? currentInfo.getClanLevel() : 0)) || (karma != currentInfo.getKarma()))))
.collect(Collectors.toList()); {
//@formatter:on sortedList.remove(i--);
}
}
Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy));
return sortedList;
} }
public long getPlayerLockTime(int playerId) public long getPlayerLockTime(int playerId)