Skip to content

Commit

Permalink
Allow set flags to be manipulate via keywords
Browse files Browse the repository at this point in the history
This adds support for updating an existing region, so that
if you have a long list of items in a set flag, such as
`deny-spawn` you can add or remove items, rather than overwrite.

Example:
```
/rg flag test deny-spawn add creeper
/rg flag test deny-spawn remove zombie
```
  • Loading branch information
DarkArc committed Jan 15, 2020
1 parent b835ee3 commit c95f52a
Showing 1 changed file with 30 additions and 1 deletion.
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

0 comments on commit c95f52a

Please sign in to comment.