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

Allow context pairs to be specified in commands, fix misuse of exceptions in the permission holder class

Browse Source
This commit is contained in:
Luck
2017-04-02 18:44:05 +01:00
Unverified
parent 0a33c0aac5
commit e7e2e3f7e0
85 changed files with 1572 additions and 2359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sponge/src/main/java/me/lucko/luckperms/sponge/SpongeSenderFactory.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class SpongeSenderFactory extends SenderFactory<CommandSource> {
@Override
protected void sendMessage(CommandSource source, FancyMessage message) {
try {
source.sendMessage(TextSerializers.JSON.deserialize(message.toJSONString()));
source.sendMessage(TextSerializers.JSON.deserialize(message.exportToJson()));
} catch (Exception e) {
sendMessage(source, message.toOldMessageFormat());
}
sponge/src/main/java/me/lucko/luckperms/sponge/migration/SpongeMigrationUtils.java
+5 -6
View File
@@ -26,7 +26,6 @@ import lombok.experimental.UtilityClass;
import me.lucko.luckperms.api.context.ContextSet;
import me.lucko.luckperms.common.commands.impl.migration.MigrationUtils;
import me.lucko.luckperms.common.core.NodeBuilder;
import me.lucko.luckperms.common.core.NodeFactory;
import me.lucko.luckperms.common.core.model.Group;
import me.lucko.luckperms.common.core.model.PermissionHolder;
@@ -63,7 +62,7 @@ public class SpongeMigrationUtils {
String world = extractedContexts.getWorld();
for (Map.Entry<String, Boolean> perm : e.getValue().entrySet()) {
holder.setPermissionUnchecked(new NodeBuilder(perm.getKey()).setServer(server).setWorld(world).withExtraContext(contexts).setValue(perm.getValue()).build());
holder.setPermission(NodeFactory.newBuilder(perm.getKey()).setServer(server).setWorld(world).withExtraContext(contexts).setValue(perm.getValue()).build());
}
}
@@ -79,11 +78,11 @@ public class SpongeMigrationUtils {
for (Map.Entry<String, String> opt : e.getValue().entrySet()) {
if (opt.getKey().equalsIgnoreCase("prefix")) {
holder.setPermissionUnchecked(NodeFactory.makePrefixNode(priority, opt.getValue()).setServer(server).setWorld(world).withExtraContext(contexts).setValue(true).build());
holder.setPermission(NodeFactory.makePrefixNode(priority, opt.getValue()).setServer(server).setWorld(world).withExtraContext(contexts).setValue(true).build());
} else if (opt.getKey().equalsIgnoreCase("suffix")) {
holder.setPermissionUnchecked(NodeFactory.makeSuffixNode(priority, opt.getValue()).setServer(server).setWorld(world).withExtraContext(contexts).setValue(true).build());
holder.setPermission(NodeFactory.makeSuffixNode(priority, opt.getValue()).setServer(server).setWorld(world).withExtraContext(contexts).setValue(true).build());
} else {
holder.setPermissionUnchecked(NodeFactory.makeMetaNode(opt.getKey(), opt.getValue()).setServer(server).setWorld(world).withExtraContext(contexts).setValue(true).build());
holder.setPermission(NodeFactory.makeMetaNode(opt.getKey(), opt.getValue()).setServer(server).setWorld(world).withExtraContext(contexts).setValue(true).build());
}
}
}
@@ -103,7 +102,7 @@ public class SpongeMigrationUtils {
continue; // LuckPerms does not support persisting other subject types.
}
holder.setPermissionUnchecked(new NodeBuilder("group." + MigrationUtils.standardizeName(s.getIdentifier())).setServer(server).setWorld(world).withExtraContext(contexts).setValue(true).build());
holder.setPermission(NodeFactory.newBuilder("group." + MigrationUtils.standardizeName(s.getIdentifier())).setServer(server).setWorld(world).withExtraContext(contexts).setValue(true).build());
}
}
}
sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsSubjectData.java
+18 -19
View File
@@ -34,7 +34,6 @@ import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.api.context.ContextSet;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.common.caching.MetaAccumulator;
import me.lucko.luckperms.common.core.NodeBuilder;
import me.lucko.luckperms.common.core.NodeFactory;
import me.lucko.luckperms.common.core.model.Group;
import me.lucko.luckperms.common.core.model.PermissionHolder;
@@ -93,31 +92,31 @@ public class LuckPermsSubjectData implements LPSubjectData {
try (Timing i = service.getPlugin().getTimings().time(LPTiming.LP_SUBJECT_SET_PERMISSION)) {
if (tristate == Tristate.UNDEFINED) {
// Unset
Node node = new NodeBuilder(permission).withExtraContext(contexts).build();
Node node = NodeFactory.newBuilder(permission).withExtraContext(contexts).build();
if (enduring) {
holder.unsetPermissionUnchecked(node);
holder.unsetPermission(node);
} else {
holder.unsetTransientPermissionUnchecked(node);
holder.unsetTransientPermission(node);
}
objectSave(holder);
return true;
}
Node node = new NodeBuilder(permission).setValue(tristate.asBoolean()).withExtraContext(contexts).build();
Node node = NodeFactory.newBuilder(permission).setValue(tristate.asBoolean()).withExtraContext(contexts).build();
// Workaround: unset the inverse, to allow false -> true, true -> false overrides.
if (enduring) {
holder.unsetPermissionUnchecked(node);
holder.unsetPermission(node);
} else {
holder.unsetTransientPermissionUnchecked(node);
holder.unsetTransientPermission(node);
}
if (enduring) {
holder.setPermissionUnchecked(node);
holder.setPermission(node);
} else {
holder.setTransientPermissionUnchecked(node);
holder.setTransientPermission(node);
}
objectSave(holder);
@@ -188,11 +187,11 @@ public class LuckPermsSubjectData implements LPSubjectData {
LPSubject permsSubject = subject.resolve(service);
if (enduring) {
holder.setPermissionUnchecked(new NodeBuilder("group." + permsSubject.getIdentifier())
holder.setPermission(NodeFactory.newBuilder("group." + permsSubject.getIdentifier())
.withExtraContext(contexts)
.build());
} else {
holder.setTransientPermissionUnchecked(new NodeBuilder("group." + permsSubject.getIdentifier())
holder.setTransientPermission(NodeFactory.newBuilder("group." + permsSubject.getIdentifier())
.withExtraContext(contexts)
.build());
}
@@ -211,11 +210,11 @@ public class LuckPermsSubjectData implements LPSubjectData {
LPSubject permsSubject = subject.resolve(service);
if (enduring) {
holder.unsetPermissionUnchecked(new NodeBuilder("group." + permsSubject.getIdentifier())
holder.unsetPermission(NodeFactory.newBuilder("group." + permsSubject.getIdentifier())
.withExtraContext(contexts)
.build());
} else {
holder.unsetTransientPermissionUnchecked(new NodeBuilder("group." + permsSubject.getIdentifier())
holder.unsetTransientPermission(NodeFactory.newBuilder("group." + permsSubject.getIdentifier())
.withExtraContext(contexts)
.build());
}
@@ -337,9 +336,9 @@ public class LuckPermsSubjectData implements LPSubjectData {
priority += 10;
if (enduring) {
holder.setPermissionUnchecked(NodeFactory.makeChatMetaNode(type.equals("prefix"), priority, value).withExtraContext(context).build());
holder.setPermission(NodeFactory.makeChatMetaNode(type.equals("prefix"), priority, value).withExtraContext(context).build());
} else {
holder.setTransientPermissionUnchecked(NodeFactory.makeChatMetaNode(type.equals("prefix"), priority, value).withExtraContext(context).build());
holder.setTransientPermission(NodeFactory.makeChatMetaNode(type.equals("prefix"), priority, value).withExtraContext(context).build());
}
} else {
@@ -352,9 +351,9 @@ public class LuckPermsSubjectData implements LPSubjectData {
toRemove.forEach(makeUnsetConsumer(enduring));
if (enduring) {
holder.setPermissionUnchecked(NodeFactory.makeMetaNode(key, value).withExtraContext(context).build());
holder.setPermission(NodeFactory.makeMetaNode(key, value).withExtraContext(context).build());
} else {
holder.setTransientPermissionUnchecked(NodeFactory.makeMetaNode(key, value).withExtraContext(context).build());
holder.setTransientPermission(NodeFactory.makeMetaNode(key, value).withExtraContext(context).build());
}
}
@@ -422,9 +421,9 @@ public class LuckPermsSubjectData implements LPSubjectData {
private Consumer<Node> makeUnsetConsumer(boolean enduring) {
return n -> {
if (enduring) {
holder.unsetPermissionUnchecked(n);
holder.unsetPermission(n);
} else {
holder.unsetTransientPermissionUnchecked(n);
holder.unsetTransientPermission(n);
}
};
}