Skip to content

Allow set flags to be manipulate with add and sub keywords #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DarkArc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow set flags to be manipulate with add and sub keywords #425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,25 @@
package com.sk89q.worldguard.protection.flags;

import com.google.common.collect.Sets;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* Stores a set of types.
*/
public class SetFlag<T> extends Flag<Set<T>> {

private static final Pattern ANY_MODIFIER = Pattern.compile("^(add|sub|subtract|rem|remove) (.*)$");
private static final Pattern REMOVE_MODIFIERS = Pattern.compile("^(sub|subtract|rem|remove) (.*)$");

private Flag<T> subFlag;

public SetFlag(String name, RegionGroup defaultGroup, Flag<T> subFlag) {
Expand Down Expand Up @@ -60,10 +67,32 @@ public Set<T> parseInput(FlagContext context) throws InvalidFlagFormat {
return Sets.newHashSet();
} else {
Set<T> items = Sets.newHashSet();
boolean subtractive = false;

// If the input starts with particular keywords, attempt to load the existing values,
// and make this a modification, instead of an overwrite.
Matcher keywordMatcher = ANY_MODIFIER.matcher(input);
if (keywordMatcher.matches()) {
ProtectedRegion region = Objects.requireNonNull((ProtectedRegion) context.get("region"));

Set<T> existingValue = region.getFlag(this);
if (existingValue != null) {
items.addAll(existingValue);
}

subtractive = REMOVE_MODIFIERS.matcher(input).matches();
input = keywordMatcher.group(2);
}

for (String str : input.split(",")) {
FlagContext copy = context.copyWith(null, str, null);
items.add(subFlag.parseInput(copy));

T subFlagValue = subFlag.parseInput(copy);
if (subtractive) {
items.remove(subFlagValue);
} else {
items.add(subFlagValue);
}
}

return items;
Expand Down