Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-27 02:21:30 +01:00
Code Issues Projects Releases Wiki Activity

Attempts to fix #602

Browse Source
This commit is contained in:
Rsl1122 2018-06-07 10:52:17 +03:00
parent 36a9825442
commit 9237ae3ef0
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
View File

@ -64,6 +64,9 @@ public class SQLFetchOps extends SQLOps implements FetchOperations {
for (UserInfo userInfo : serverUserInfo) { for (UserInfo userInfo : serverUserInfo) {
UUID uuid = userInfo.getUuid(); UUID uuid = userInfo.getUuid();
if (uuid == null) {
continue;
}
PlayerProfile profile = new PlayerProfile(uuid, userInfo.getName(), userInfo.getRegistered()); PlayerProfile profile = new PlayerProfile(uuid, userInfo.getName(), userInfo.getRegistered());
profile.setTimesKicked(timesKicked.getOrDefault(uuid, 0)); profile.setTimesKicked(timesKicked.getOrDefault(uuid, 0));
if (userInfo.isBanned()) { if (userInfo.isBanned()) {

2
Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/AnalysisPage.java
View File

@ -9,6 +9,7 @@ import com.djrapitops.plan.data.calculation.AnalysisData;
import com.djrapitops.plan.system.webserver.response.errors.ErrorResponse; import com.djrapitops.plan.system.webserver.response.errors.ErrorResponse;
import com.djrapitops.plan.utilities.file.FileUtil; import com.djrapitops.plan.utilities.file.FileUtil;
import com.djrapitops.plan.utilities.html.HtmlUtils; import com.djrapitops.plan.utilities.html.HtmlUtils;
import com.djrapitops.plugin.utilities.Verify;
import java.io.IOException; import java.io.IOException;
@ -22,6 +23,7 @@ public class AnalysisPage extends Page {
private final AnalysisData data; private final AnalysisData data;
public AnalysisPage(AnalysisData analysisData) { public AnalysisPage(AnalysisData analysisData) {
Verify.nullCheck(analysisData, () -> new IllegalArgumentException("Analysis failed, data object was null"));
this.data = analysisData; this.data = analysisData;
} }