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

Removed stream usage from MatchingRoomManager.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-01-08 14:22:03 +00:00
parent 82d5c63714
commit 39a249d4e5
26 changed files with 260 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)

21
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/MatchingRoomManager.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.MatchingRoomType;
@@ -73,16 +72,16 @@ public class MatchingRoomManager
{
return Collections.emptyList();
}
return _waitingList.stream() //
.filter(p -> (p != null) //
&& (p.getLevel() >= minLevel) //
&& (p.getLevel() <= maxLevel)) //
.filter(p -> (classIds == null) //
|| classIds.contains(p.getClassId())) //
.filter(p -> (query == null) //
|| query.isEmpty() //
|| p.getName().toLowerCase().contains(query)) //
.collect(Collectors.toList());
final List<Player> players = new ArrayList<>();
for (Player player : _waitingList)
{
if ((player != null) && (player.getLevel() >= minLevel) && (player.getLevel() <= maxLevel) && ((classIds == null) || classIds.contains(player.getClassId())) && ((query == null) || query.isEmpty() || player.getName().toLowerCase().contains(query)))
{
players.add(player);
}
}
return players;
}
public int addMatchingRoom(MatchingRoom room)