Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2025-02-05 15:11:56 +01:00
Code Issues Projects Releases Wiki Activity

Re-implement parsing first/second context values as server/world respectively (#1837)

Browse Source
This commit is contained in:
Luck 2019-12-02 21:23:58 +00:00
parent 2eb0c1e67e
commit a07f876c85
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 33 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
common/src/main/java/me/lucko/luckperms/common/command/utils/ArgumentParser.java
View File

@ -34,6 +34,7 @@ import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.storage.misc.DataConstraints; import me.lucko.luckperms.common.storage.misc.DataConstraints;
import me.lucko.luckperms.common.util.DateParser; import me.lucko.luckperms.common.util.DateParser;
import net.luckperms.api.context.DefaultContextKeys;
import net.luckperms.api.context.ImmutableContextSet; import net.luckperms.api.context.ImmutableContextSet;
import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.context.MutableContextSet;
import net.luckperms.api.model.data.TemporaryNodeMergeStrategy; import net.luckperms.api.model.data.TemporaryNodeMergeStrategy;
@ -155,24 +156,42 @@ public class ArgumentParser {
if (args.size() <= fromIndex) { if (args.size() <= fromIndex) {
return plugin.getConfiguration().getContextsFile().getDefaultContexts().mutableCopy(); return plugin.getConfiguration().getContextsFile().getDefaultContexts().mutableCopy();
} }
return parseContext(fromIndex, args);
}
public static ImmutableContextSet parseContextSponge(int fromIndex, List<String> args) {
if (args.size() <= fromIndex) {
return ImmutableContextSetImpl.EMPTY;
}
return parseContext(fromIndex, args).immutableCopy();
}
private static MutableContextSet parseContext(int fromIndex, List<String> args) {
MutableContextSet contextSet = new MutableContextSetImpl(); MutableContextSet contextSet = new MutableContextSetImpl();
List<String> toQuery = args.subList(fromIndex, args.size()); List<String> pairs = args.subList(fromIndex, args.size());
for (String s : toQuery) { for (int i = 0; i < pairs.size(); i++) {
int index = s.indexOf('='); String pair = pairs.get(i);
int index = pair.indexOf('=');
String key;
String value;
if (index != -1) { if (index != -1) {
String key = s.substring(0, index); key = pair.substring(0, index);
if (key.equals("") || key.trim().isEmpty()) { value = pair.substring(index + 1);
continue; } else {
} key = i == 1 ? DefaultContextKeys.WORLD_KEY : DefaultContextKeys.SERVER_KEY;
value = pair;
String value = s.substring(index + 1);
if (value.equals("") || value.trim().isEmpty()) {
continue;
}
contextSet.add(key, value);
} }
if (key.equals("") || key.trim().isEmpty()) {
continue;
}
if (value.equals("") || value.trim().isEmpty()) {
continue;
}
contextSet.add(key, value);
} }
return contextSet; return contextSet;
@ -186,33 +205,6 @@ public class ArgumentParser {
} }
} }
public static ImmutableContextSet parseContextSponge(int fromIndex, List<String> args) {
if (args.size() <= fromIndex) {
return ImmutableContextSetImpl.EMPTY;
}
MutableContextSet contextSet = new MutableContextSetImpl();
List<String> toQuery = args.subList(fromIndex, args.size());
for (String s : toQuery) {
int index = s.indexOf('=');
if (index != -1) {
String key = s.substring(0, index);
if (key.equals("") || key.trim().isEmpty()) {
continue;
}
String value = s.substring(index + 1);
if (value.equals("") || value.trim().isEmpty()) {
continue;
}
contextSet.add(key, value);
}
}
return contextSet.immutableCopy();
}
public static UUID parseUserTarget(int index, List<String> args, LuckPermsPlugin plugin, Sender sender) { public static UUID parseUserTarget(int index, List<String> args, LuckPermsPlugin plugin, Sender sender) {
final String target = args.get(index); final String target = args.get(index);
return UserMainCommand.parseTargetUniqueId(target, plugin, sender); return UserMainCommand.parseTargetUniqueId(target, plugin, sender);