[2.9.0-DEV] Bugfixes

Fix #61 #58 #56 #57 #59
- Fixed GamemodeTimesHandler giving NPE if a gamemode is null.
- Fixed ArrayOutOfBounds if sessions is empty.
- Fixed randomly caused NPE when transforming sessions to length values
(also improved it)

Demographics tab not yet finished.

Plan/src/main/java/com/djrapitops/plan/data/UserData.java

@@ -225,6 +225,9 @@ public class UserData {
      * @param time
      */
     public void setGMTime(GameMode gm, long time) {
+        if (gmTimes == null) {
+            gmTimes = new HashMap<>();
+        }
         gmTimes.put(gm, time);
     }
 

Plan/src/main/java/com/djrapitops/plan/data/handlers/GamemodeTimesHandler.java

@@ -33,7 +33,7 @@ public class GamemodeTimesHandler {
      * @param data UserData matching the Player
      */
     public void handleLogin(GameMode gm, UserData data) {
-        data.setLastGamemode(gm);
+        handleChangeEvent(gm, data);
     }
 
     /**
@@ -45,15 +45,19 @@ public class GamemodeTimesHandler {
      * @param data UserData matching the Player
      */
     public void handleChangeEvent(GameMode newGM, UserData data) {
+        if (newGM == null) {
+            return;
+        }
+        if (data.getLastGamemode() == null) {
+            data.setLastGamemode(GameMode.SURVIVAL);
+        }
+        GameMode oldGM = data.getLastGamemode();
         HashMap<GameMode, Long> times = data.getGmTimes();
+        Long currentGMTime = times.get(oldGM);
         handler.getActivityHandler().saveToCache(data);
-
         long lastSwap = data.getLastGmSwapTime();
         long playTime = data.getPlayTime();
-        GameMode oldGM = data.getLastGamemode();
-        if (oldGM != null) {
-            data.setGMTime(oldGM, times.get(oldGM) + (playTime - lastSwap));
-        }
+        data.setGMTime(oldGM, currentGMTime + (playTime - lastSwap));
         data.setLastGamemode(newGM);
         data.setLastGmSwapTime(playTime);
     }
@@ -65,13 +69,14 @@ public class GamemodeTimesHandler {
      * @param data UserData matching the Player
      */
     public void saveToCache(GameMode currentGM, UserData data) {
+        if (currentGM == null) {
+            return;
+        }
         HashMap<GameMode, Long> times = data.getGmTimes();
         handler.getActivityHandler().saveToCache(data);
-
         long lastSwap = data.getLastGmSwapTime();
         long playtime = data.getPlayTime();
         data.setGMTime(currentGM, times.get(currentGM) + (playtime - lastSwap));
-
         data.setLastGmSwapTime(playtime);
     }
 

Plan/src/main/java/com/djrapitops/plan/utilities/Analysis.java

@@ -176,7 +176,10 @@ public class Analysis {
                 sorted.addTotalKills(uData.getPlayerKills().size());
                 sorted.addTotalMobKills(uData.getMobKills());
                 sorted.addTotalDeaths(uData.getDeaths());
-                sorted.getSessiondata().addAll(uData.getSessions());
+                List<SessionData> sessions = uData.getSessions();
+                if (!sessions.isEmpty()) {
+                    sorted.getSessiondata().addAll(sessions);
+                }
                 sorted.getRegistered().add(uData.getRegistered());
                 sorted.addGeoloc(uData.getDemData().getGeoLocation());
                 uData.stopAccessing();

Plan/src/main/java/com/djrapitops/plan/utilities/AnalysisUtils.java

@@ -5,6 +5,7 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 import main.java.com.djrapitops.plan.Settings;
 import main.java.com.djrapitops.plan.data.SessionData;
 import main.java.com.djrapitops.plan.data.UserData;
@@ -62,11 +63,11 @@ public class AnalysisUtils {
     }
 
     public static List<Long> transformSessionDataToLengths(Collection<SessionData> data) {
-        List<SessionData> d = new ArrayList<>(data);
-        List<Long> list = new ArrayList<>();
-        d.stream().forEach((sData) -> {
-            list.add(sData.getSessionEnd()-sData.getSessionStart());
-        });
+        List<Long> list = data.stream()
+                .filter(session -> session != null)
+                .filter(session -> session.getSessionEnd() > session.getSessionStart())
+                .map(session -> session.getSessionEnd() - session.getSessionStart())
+                .collect(Collectors.toList());
         return list;
     }