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

Removed source of null current world

Browse Source 
Affects issues:
- Close #1119
This commit is contained in:
Rsl1122 2019-07-29 10:37:36 +03:00
parent 8f639f7f41
commit 91bbb00968
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plan/common/src/main/java/com/djrapitops/plan/data/time/WorldTimes.java
View File

@ -19,6 +19,7 @@ package com.djrapitops.plan.data.time;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
/** /**
* Class that tracks the time spent in each World based on GMTimes. * Class that tracks the time spent in each World based on GMTimes.
@ -171,8 +172,8 @@ public class WorldTimes {
return b.toString(); return b.toString();
} }
public String getCurrentWorld() { public Optional<String> getCurrentWorld() {
return currentWorld; return Optional.ofNullable(currentWorld);
} }
public void add(WorldTimes toAdd) { public void add(WorldTimes toAdd) {

7
Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigNode.java
View File

@ -63,6 +63,9 @@ public class ConfigNode {
} }
public Optional<ConfigNode> getNode(String path) { public Optional<ConfigNode> getNode(String path) {
if (path == null) {
return Optional.empty();
}
String[] parts = splitPathInTwo(path); String[] parts = splitPathInTwo(path);
String key = parts[0]; String key = parts[0];
String leftover = parts[1]; String leftover = parts[1];
@ -88,7 +91,7 @@ public class ConfigNode {
public ConfigNode addNode(String path) { public ConfigNode addNode(String path) {
ConfigNode newParent = this; ConfigNode newParent = this;
if (!path.isEmpty()) { if (path != null && !path.isEmpty()) {
String[] parts = splitPathInTwo(path); String[] parts = splitPathInTwo(path);
String key = parts[0]; String key = parts[0];
String leftover = parts[1]; String leftover = parts[1];
@ -105,7 +108,7 @@ public class ConfigNode {
// Otherwise continue recursively. // Otherwise continue recursively.
return leftover.isEmpty() ? child : child.addNode(leftover); return leftover.isEmpty() ? child : child.addNode(leftover);
} }
throw new IllegalArgumentException("Can not add a node with empty path"); throw new IllegalArgumentException("Can not add a node with path '" + path + "'");
} }
/** /**

5
Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/WorldAliasSettings.java
View File

@ -157,8 +157,9 @@ public class WorldAliasSettings {
} }
WorldTimes worldTimes = session.getValue(SessionKeys.WORLD_TIMES).orElse(new WorldTimes()); WorldTimes worldTimes = session.getValue(SessionKeys.WORLD_TIMES).orElse(new WorldTimes());
if (!session.supports(SessionKeys.END)) { if (!session.supports(SessionKeys.END)) {
String currentWorld = worldTimes.getCurrentWorld(); return worldTimes.getCurrentWorld()
return "Current: " + (aliases.contains(currentWorld) ? aliases.getString(currentWorld) : currentWorld); .map(currentWorld -> "Current: " + (aliases.contains(currentWorld) ? aliases.getString(currentWorld) : currentWorld))
.orElse("Current: Unavailable");
} }
Map<String, Long> playtimePerAlias = getPlaytimePerAlias(worldTimes); Map<String, Long> playtimePerAlias = getPlaytimePerAlias(worldTimes);