PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

fix NPE in IPlayerManager#getOnlyVisibleFor(...)

Browse Source
This commit is contained in:
Marc Baloup
2022-06-22 01:37:04 +02:00
parent db27f9e15f
commit b2c2d98dd1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Core/src/main/java/fr/pandacube/lib/core/players/IPlayerManager.java
View File

@@ -115,12 +115,13 @@ public abstract class IPlayerManager<OP extends IOnlinePlayer, OF extends IOffPl
public List<OP> getOnlyVisibleFor(OF viewer) { public List<OP> getOnlyVisibleFor(OF viewer) {
List<OP> players = getAll(); List<OP> players = getAll();
players.removeIf(op -> op.isVanishedFor(viewer)); if (viewer != null)
players.removeIf(op -> op.isVanishedFor(viewer));
return players; return players;
} }
public List<OP> getOnlyVisibleFor(OP viewer, boolean sameServerOnly) { public List<OP> getOnlyVisibleFor(OP viewer, boolean sameServerOnly) {
if (sameServerOnly && viewer.getServerName() == null) if (sameServerOnly && (viewer == null || viewer.getServerName() == null))
return Collections.emptyList(); return Collections.emptyList();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")