carm/MoeTeleport
carm/MoeTeleport
1
Fork 0
mirror of https://github.com/CarmJos/MoeTeleport.git synced 2024-09-19 13:25:56 +00:00
Code Issues Releases Activity

修复报错空lastLocation的问题

Browse Source
This commit is contained in:
Carm Jos 2022-02-25 05:37:41 +08:00
parent 623fc36c20
commit e186e5ea0a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/cc/carm/plugin/moeteleport/storage/file/JSONStorage.java
View File

@ -16,7 +16,6 @@ import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.util.LinkedHashMap;
import java.util.Optional;
import java.util.UUID;
public class JSONStorage extends FileBasedStorage {
@ -36,19 +35,20 @@ public class JSONStorage extends FileBasedStorage {
if (!dataElement.isJsonObject()) throw new NullPointerException(userDataFile.getName());
JsonObject dataObject = dataElement.getAsJsonObject();
DataLocation lastLocation = Optional
.ofNullable(dataObject.get("lastLocation").getAsString())
.map(DataLocation::deserializeText)
.orElse(null);
DataLocation lastLocation = null;
if (dataObject.has("lastLocation")) {
lastLocation = DataLocation.deserializeText(dataObject.get("lastLocation").getAsString());
}
LinkedHashMap<String, DataLocation> homeData = new LinkedHashMap<>();
JsonObject homesObject = dataObject.getAsJsonObject("homes");
if (homesObject != null) {
homesObject.entrySet().forEach(entry -> {
DataLocation location = DataLocation.deserializeText(entry.getValue().getAsString());
if (location != null) homeData.put(entry.getKey(), location);
});
if (dataObject.has("homes")) {
JsonObject homesObject = dataObject.getAsJsonObject("homes");
if (homesObject != null) {
homesObject.entrySet().forEach(entry -> {
DataLocation location = DataLocation.deserializeText(entry.getValue().getAsString());
if (location != null) homeData.put(entry.getKey(), location);
});
}
}
return new UserData(uuid, lastLocation, homeData);