Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-10-23 12:50:23 +02:00
Code Issues Projects Releases Wiki Activity

Fix sponge subject storage

Browse Source
This commit is contained in:
Luck 2018-04-25 17:30:02 +01:00
parent ba51f803ba
commit cbb562b603
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongeBootstrap.java
View File

@ -240,13 +240,13 @@ public class LPSpongeBootstrap implements LuckPermsBootstrap {
@Override
public Path getDataDirectory() {
Path dataDirectory = this.game.getGameDirectory().resolve("luckperms");
Path dataDirectory = this.game.getGameDirectory().toAbsolutePath().resolve("luckperms");
try {
Files.createDirectories(dataDirectory);
} catch (IOException e) {
e.printStackTrace();
}
return dataDirectory.toAbsolutePath();
return dataDirectory;
}
@Override

20
sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/SubjectStorage.java
View File

@ -30,6 +30,7 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject;
import me.lucko.luckperms.common.utils.ImmutableCollectors;
import me.lucko.luckperms.sponge.service.model.LPPermissionService;
import java.io.BufferedReader;
@ -42,7 +43,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
@ -69,15 +69,6 @@ public class SubjectStorage {
this.service = service;
this.gson = new GsonBuilder().setPrettyPrinting().create();
this.container = container;
checkContainer();
}
private void checkContainer() {
try {
Files.createDirectories(this.container.getParent());
} catch (IOException e) {
e.printStackTrace();
}
}
/**
@ -86,12 +77,14 @@ public class SubjectStorage {
* @return the identifiers of all known collections
*/
public Set<String> getSavedCollections() {
checkContainer();
if (!Files.exists(this.container)) {
return ImmutableSet.of();
}
try (Stream<Path> s = Files.list(this.container)) {
return s.filter(p -> Files.isDirectory(p))
.map(p -> p.getFileName().toString())
.collect(Collectors.toSet());
.collect(ImmutableCollectors.toSet());
} catch (IOException e) {
e.printStackTrace();
return ImmutableSet.of();
@ -106,7 +99,6 @@ public class SubjectStorage {
* @return a file
*/
private Path resolveFile(String collectionIdentifier, String subjectIdentifier) {
checkContainer();
Path collection = this.container.resolve(collectionIdentifier);
try {
Files.createDirectories(collection);
@ -150,7 +142,6 @@ public class SubjectStorage {
* @return a map of found subjects
*/
public Map<String, SubjectDataContainer> loadAllFromFile(String collectionIdentifier) {
checkContainer();
Path collection = this.container.resolve(collectionIdentifier);
if (!Files.exists(collection)) {
return Collections.emptyMap();
@ -184,7 +175,6 @@ public class SubjectStorage {
* @throws IOException if the read fails
*/
public LoadedSubject loadFromFile(String collectionIdentifier, String subjectIdentifier) throws IOException {
checkContainer();
Path collection = this.container.resolve(collectionIdentifier);
if (!Files.exists(collection)) {
return null;