diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId) diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index f16826f7eb..d66d6eabf8 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; @@ -341,14 +340,17 @@ public class ClanEntryManager public List getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1); - - // TODO: Handle Role - //@formatter:off - return _waitingList.values().stream() - .filter(p -> ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax))) - .sorted(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List result = new ArrayList<>(); + for (PledgeWaitingInfo p : _waitingList.values()) + { + // TODO: Handle Role. + if ((p.getPlayerLvl() >= levelMin) && (p.getPlayerLvl() <= levelMax)) + { + result.add(p); + } + } + result.sort(descending ? PLAYER_COMPARATOR.get(sortBy).reversed() : PLAYER_COMPARATOR.get(sortBy)); + return result; } public List queryWaitingListByName(String name) @@ -407,19 +409,23 @@ public class ClanEntryManager public List getUnSortedClanList() { - return _clanList.values().stream().collect(Collectors.toList()); + return new ArrayList<>(_clanList.values()); } public List getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending) { final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1); - - //@formatter:off - 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())))))) - .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) - .collect(Collectors.toList()); - //@formatter:on + final List sortedList = new ArrayList<>(_clanList.values()); + for (int i = 0; i < sortedList.size(); i++) + { + final PledgeRecruitInfo currentInfo = sortedList.get(i); + 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())))) + { + sortedList.remove(i--); + } + } + Collections.sort(sortedList, descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)); + return sortedList; } public long getPlayerLockTime(int playerId)