Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-11-01 00:10:12 +01:00
Code Issues Projects Releases Wiki Activity

Added a couple null checks in an attempt to fix #26

Browse Source 
Cause for NPE still unknown
This commit is contained in:
Rsl1122 2017-02-25 22:04:04 +02:00
parent 814f6771a8
commit a820da3261
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Plan/src/main/java/com/djrapitops/plan/data/UserData.java
View File

@ -7,6 +7,7 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Collectors;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
@ -151,11 +152,16 @@ public class UserData {
} }
public void addSession(SessionData session) { public void addSession(SessionData session) {
sessions.add(session); if (session != null) {
sessions.add(session);
}
} }
public void addSessions(Collection<SessionData> sessions) { public void addSessions(Collection<SessionData> sessions) {
this.sessions.addAll(sessions); Collection<SessionData> filteredSessions = sessions.parallelStream()
.filter(session -> session != null)
.collect(Collectors.toList());
this.sessions.addAll(filteredSessions);
} }
public void setCurrentSession(SessionData session) { public void setCurrentSession(SessionData session) {

1
Plan/src/main/java/com/djrapitops/plan/ui/graphs/PlayerActivityGraphCreator.java
View File

@ -24,6 +24,7 @@ public class PlayerActivityGraphCreator {
CopyOnWriteArrayList<Long> sessionEnds = new CopyOnWriteArrayList<>(); CopyOnWriteArrayList<Long> sessionEnds = new CopyOnWriteArrayList<>();
CopyOnWriteArrayList<SessionData> s = new CopyOnWriteArrayList(sessionData); CopyOnWriteArrayList<SessionData> s = new CopyOnWriteArrayList(sessionData);
s.parallelStream() s.parallelStream()
.filter(session -> (session != null))
.filter((session) -> (session.getSessionStart() > nowMinusScale)) .filter((session) -> (session.getSessionStart() > nowMinusScale))
.forEach((session) -> { .forEach((session) -> {
sessionEnds.add(session.getSessionEnd()); sessionEnds.add(session.getSessionEnd());