worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Context set values should be lowercase'd too

Browse Source
This commit is contained in:
Luck
2018-04-26 19:51:05 +01:00
Unverified
parent 316e177c1d
commit fef6ebf793
5 changed files with 15 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/me/lucko/luckperms/common/node/ImmutableNode.java
+1 -1
View File
@@ -321,7 +321,7 @@ public final class ImmutableNode implements Node {
@Override
public boolean shouldApplyWithContext(@Nonnull ContextSet contextSet) {
return getFullContexts().isSatisfiedBy(contextSet, false);
return getFullContexts().isSatisfiedBy(contextSet);
}
@Nonnull
common/src/main/java/me/lucko/luckperms/common/storage/dao/file/FileActionLogger.java
+7 -4
View File
@@ -25,10 +25,11 @@
package me.lucko.luckperms.common.storage.dao.file;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.internal.Streams;
import com.google.gson.JsonParser;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
@@ -49,6 +50,8 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.locks.ReentrantLock;
public class FileActionLogger {
private static final JsonParser JSON_PARSER = new JsonParser();
private static final Gson GSON = new Gson();
/**
* The path to save logger content to
@@ -94,7 +97,7 @@ public class FileActionLogger {
if (Files.exists(this.contentFile)) {
try (JsonReader reader = new JsonReader(Files.newBufferedReader(this.contentFile, StandardCharsets.UTF_8))) {
array = Streams.parse(reader).getAsJsonArray();
array = JSON_PARSER.parse(reader).getAsJsonArray();
} catch (IOException e) {
e.printStackTrace();
array = new JsonArray();
@@ -123,7 +126,7 @@ public class FileActionLogger {
// write the full content back to the file
try (JsonWriter writer = new JsonWriter(Files.newBufferedWriter(this.contentFile, StandardCharsets.UTF_8))) {
writer.setIndent(" ");
Streams.write(array, writer);
GSON.toJson(array, writer);
}
} catch (IOException e) {
e.printStackTrace();
@@ -136,7 +139,7 @@ public class FileActionLogger {
public Log getLog() throws IOException {
Log.Builder log = Log.builder();
try (JsonReader reader = new JsonReader(Files.newBufferedReader(this.contentFile, StandardCharsets.UTF_8))) {
JsonArray array = Streams.parse(reader).getAsJsonArray();
JsonArray array = JSON_PARSER.parse(reader).getAsJsonArray();
for (JsonElement element : array) {
JsonObject object = element.getAsJsonObject();