From 76c34053114ad26640bce32bf82df3db5e64d94a Mon Sep 17 00:00:00 2001 From: wizjany Date: Tue, 2 Jul 2019 17:39:21 -0400 Subject: [PATCH] Don't replace in comments and strings when you refactor... (cherry picked from commit a9cd23c6efdbf7e78f0e49f81b0200baa14b3513) --- .../protection/ApplicableRegionSet.java | 8 ++++---- .../protection/regions/RegionQuery.java | 17 ++++++++--------- .../worldguard/util/report/RegionReport.java | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java index 6e576ce5b..8a7a9dc22 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java @@ -65,7 +65,7 @@ public interface ApplicableRegionSet extends Iterable { * *

{@code subject} can be non-null to satisfy region group requirements, * otherwise it will be assumed that the caller that is not a member of any - * regions. (FlagUtil on a region can be changed so that they only apply + * regions. (Flags on a region can be changed so that they only apply * to certain users.) The subject argument is required if the * {@link Flags#BUILD} flag is in the list of flags.

* @@ -83,7 +83,7 @@ public interface ApplicableRegionSet extends Iterable { * *

{@code subject} can be non-null to satisfy region group requirements, * otherwise it will be assumed that the caller that is not a member of any - * regions. (FlagUtil on a region can be changed so that they only apply + * regions. (Flags on a region can be changed so that they only apply * to certain users.) The subject argument is required if the * {@link Flags#BUILD} flag is in the list of flags.

* @@ -108,7 +108,7 @@ public interface ApplicableRegionSet extends Iterable { * *

{@code subject} can be non-null to satisfy region group requirements, * otherwise it will be assumed that the caller that is not a member of any - * regions. (FlagUtil on a region can be changed so that they only apply + * regions. (Flags on a region can be changed so that they only apply * to certain users.) The subject argument is required if the * {@link Flags#BUILD} flag is the flag being queried.

* @@ -126,7 +126,7 @@ public interface ApplicableRegionSet extends Iterable { * *

{@code subject} can be non-null to satisfy region group requirements, * otherwise it will be assumed that the caller that is not a member of any - * regions. (FlagUtil on a region can be changed so that they only apply + * regions. (Flags on a region can be changed so that they only apply * to certain users.) The subject argument is required if the * {@link Flags#BUILD} flag is the flag being queried.

* diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/regions/RegionQuery.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/regions/RegionQuery.java index 01087e57a..59adb0c8b 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/regions/RegionQuery.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/regions/RegionQuery.java @@ -67,7 +67,6 @@ public RegionQuery(QueryCache cache) { this.config = WorldGuard.getInstance().getPlatform().getGlobalStateManager(); this.cache = cache; - //noinspection deprecation } /** @@ -178,7 +177,7 @@ public boolean testBuild(Location location, RegionAssociable associable, StateFl * *

{@code player} can be non-null to satisfy region group requirements, * otherwise it will be assumed that the caller that is not a member of any - * regions. (FlagUtil on a region can be changed so that they only apply + * regions. (Flags on a region can be changed so that they only apply * to certain users.) The player argument is required if the * {@link Flags#BUILD} flag is in the list of flags.

* @@ -201,7 +200,7 @@ public boolean testState(Location location, @Nullable LocalPlayer player, StateF * *

{@code player} can be non-null to satisfy region group requirements, * otherwise it will be assumed that the caller that is not a member of any - * regions. (FlagUtil on a region can be changed so that they only apply + * regions. (Flags on a region can be changed so that they only apply * to certain users.) The player argument is required if the * {@link Flags#BUILD} flag is in the list of flags.

* @@ -225,7 +224,7 @@ public boolean testState(Location location, @Nullable RegionAssociable associabl * *

{@code player} can be non-null to satisfy region group requirements, * otherwise it will be assumed that the caller that is not a member of any - * regions. (FlagUtil on a region can be changed so that they only apply + * regions. (Flags on a region can be changed so that they only apply * to certain users.) The player argument is required if the * {@link Flags#BUILD} flag is in the list of flags.

* @@ -247,7 +246,7 @@ public State queryState(Location location, @Nullable LocalPlayer player, StateFl * *

{@code player} can be non-null to satisfy region group requirements, * otherwise it will be assumed that the caller that is not a member of any - * regions. (FlagUtil on a region can be changed so that they only apply + * regions. (Flags on a region can be changed so that they only apply * to certain users.) The player argument is required if the * {@link Flags#BUILD} flag is in the list of flags.

* @@ -276,7 +275,7 @@ public State queryState(Location location, @Nullable RegionAssociable associable * *

{@code player} can be non-null to satisfy region group requirements, * otherwise it will be assumed that the caller that is not a member of any - * regions. (FlagUtil on a region can be changed so that they only apply + * regions. (Flags on a region can be changed so that they only apply * to certain users.) The player argument is required if the * {@link Flags#BUILD} flag is the flag being queried.

* @@ -305,7 +304,7 @@ public V queryValue(Location location, @Nullable LocalPlayer player, Flag * *

{@code player} can be non-null to satisfy region group requirements, * otherwise it will be assumed that the caller that is not a member of any - * regions. (FlagUtil on a region can be changed so that they only apply + * regions. (Flags on a region can be changed so that they only apply * to certain users.) The player argument is required if the * {@link Flags#BUILD} flag is the flag being queried.

* @@ -327,7 +326,7 @@ public V queryValue(Location location, @Nullable RegionAssociable associable * *

{@code player} can be non-null to satisfy region group requirements, * otherwise it will be assumed that the caller that is not a member of any - * regions. (FlagUtil on a region can be changed so that they only apply + * regions. (Flags on a region can be changed so that they only apply * to certain users.) The player argument is required if the * {@link Flags#BUILD} flag is the flag being queried.

* @@ -348,7 +347,7 @@ public Collection queryAllValues(Location location, @Nullable LocalPlayer * *

{@code player} can be non-null to satisfy region group requirements, * otherwise it will be assumed that the caller that is not a member of any - * regions. (FlagUtil on a region can be changed so that they only apply + * regions. (Flags on a region can be changed so that they only apply * to certain users.) The player argument is required if the * {@link Flags#BUILD} flag is the flag being queried.

* diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/util/report/RegionReport.java b/worldguard-core/src/main/java/com/sk89q/worldguard/util/report/RegionReport.java index ae36d7c08..f25631ec4 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/util/report/RegionReport.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/util/report/RegionReport.java @@ -34,7 +34,7 @@ public RegionReport(ProtectedRegion region) { append("Priority", region.getPriority()); append("Owners", region.getOwners()); append("Members", region.getMembers()); - append("FlagUtil", region.getFlags()); + append("Flags", region.getFlags()); } }