From f4a3e8a936f7464fad80c8b90df95b5f859dbb64 Mon Sep 17 00:00:00 2001 From: wizjany Date: Thu, 11 Jun 2020 14:57:22 -0400 Subject: [PATCH] Allow setting passthrough on global via /rg flags. Closes #1584. --- .../worldguard/commands/region/FlagHelperBox.java | 2 +- .../worldguard/protection/flags/NumberFlag.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/FlagHelperBox.java b/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/FlagHelperBox.java index 4c021eeb..6389a394 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/FlagHelperBox.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/FlagHelperBox.java @@ -199,7 +199,7 @@ private void appendValueChoices(TextComponent.Builder builder, Flag flag, if (maySet) { if (isExplicitSet) { hoverTexts.add(TextComponent.of("Click to unset", TextColor.GOLD)); - } else if (DANGER_ZONE.contains(flag)) { + } else if (DANGER_ZONE.contains(flag) && !(ProtectedRegion.GLOBAL_REGION.equals(region.getId()) && flag == Flags.PASSTHROUGH)) { hoverTexts.add(TextComponent.of("Setting this flag may have unintended consequences.", TextColor.RED) .append(TextComponent.newline()) .append(TextComponent.of("Please read the documentation and set this flag manually if you really intend to.") diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/NumberFlag.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/NumberFlag.java index 53f0726d..9f6764bf 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/NumberFlag.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/NumberFlag.java @@ -21,6 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.annotations.Beta; + /** * Stores an Number. */ @@ -37,10 +39,20 @@ protected NumberFlag(String name) { super(name); } + /** + * Not recommended for public use. Will likely be moved when migrating to piston for commands. + * @param values suggested values + */ + @Beta public void setSuggestedValues(Number[] values) { this.suggestions = checkNotNull(values); } + /** + * Not recommended for public use. Will likely be moved when migrating to piston for commands. + * @return suggested values + */ + @Beta public Number[] getSuggestedValues() { return suggestions; }