Skip to content

Commit

Permalink
Don't replace in comments and strings when you refactor...
Browse files Browse the repository at this point in the history 
(cherry picked from commit a9cd23c)
  • Loading branch information
@wizjany
wizjany committed Jul 3, 2019
1 parent eee7577 commit 76c3405
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
8 changes: 4 additions & 4 deletions worldguard-core/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java
View file
Expand Up @@ -65,7 +65,7 @@ public interface ApplicableRegionSet extends Iterable<ProtectedRegion> {
* *
* <p>{@code subject} can be non-null to satisfy region group requirements, * <p>{@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 * 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 * to certain users.) The subject argument is required if the
* {@link Flags#BUILD} flag is in the list of flags.</p> * {@link Flags#BUILD} flag is in the list of flags.</p>
* *
Expand All @@ -83,7 +83,7 @@ public interface ApplicableRegionSet extends Iterable<ProtectedRegion> {
* *
* <p>{@code subject} can be non-null to satisfy region group requirements, * <p>{@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 * 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 * to certain users.) The subject argument is required if the
* {@link Flags#BUILD} flag is in the list of flags.</p> * {@link Flags#BUILD} flag is in the list of flags.</p>
* *
Expand All @@ -108,7 +108,7 @@ public interface ApplicableRegionSet extends Iterable<ProtectedRegion> {
* *
* <p>{@code subject} can be non-null to satisfy region group requirements, * <p>{@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 * 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 * to certain users.) The subject argument is required if the
* {@link Flags#BUILD} flag is the flag being queried.</p> * {@link Flags#BUILD} flag is the flag being queried.</p>
* *
Expand All @@ -126,7 +126,7 @@ public interface ApplicableRegionSet extends Iterable<ProtectedRegion> {
* *
* <p>{@code subject} can be non-null to satisfy region group requirements, * <p>{@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 * 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 * to certain users.) The subject argument is required if the
* {@link Flags#BUILD} flag is the flag being queried.</p> * {@link Flags#BUILD} flag is the flag being queried.</p>
* *
Expand Down
17 changes: 8 additions & 9 deletions worldguard-core/src/main/java/com/sk89q/worldguard/protection/regions/RegionQuery.java
View file
Expand Up @@ -67,7 +67,6 @@ public RegionQuery(QueryCache cache) {


this.config = WorldGuard.getInstance().getPlatform().getGlobalStateManager(); this.config = WorldGuard.getInstance().getPlatform().getGlobalStateManager();
this.cache = cache; this.cache = cache;
//noinspection deprecation
} }


/** /**
Expand Down Expand Up @@ -178,7 +177,7 @@ public boolean testBuild(Location location, RegionAssociable associable, StateFl
* *
* <p>{@code player} can be non-null to satisfy region group requirements, * <p>{@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 * 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 * to certain users.) The player argument is required if the
* {@link Flags#BUILD} flag is in the list of flags.</p> * {@link Flags#BUILD} flag is in the list of flags.</p>
* *
Expand All @@ -201,7 +200,7 @@ public boolean testState(Location location, @Nullable LocalPlayer player, StateF
* *
* <p>{@code player} can be non-null to satisfy region group requirements, * <p>{@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 * 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 * to certain users.) The player argument is required if the
* {@link Flags#BUILD} flag is in the list of flags.</p> * {@link Flags#BUILD} flag is in the list of flags.</p>
* *
Expand All @@ -225,7 +224,7 @@ public boolean testState(Location location, @Nullable RegionAssociable associabl
* *
* <p>{@code player} can be non-null to satisfy region group requirements, * <p>{@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 * 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 * to certain users.) The player argument is required if the
* {@link Flags#BUILD} flag is in the list of flags.</p> * {@link Flags#BUILD} flag is in the list of flags.</p>
* *
Expand All @@ -247,7 +246,7 @@ public State queryState(Location location, @Nullable LocalPlayer player, StateFl
* *
* <p>{@code player} can be non-null to satisfy region group requirements, * <p>{@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 * 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 * to certain users.) The player argument is required if the
* {@link Flags#BUILD} flag is in the list of flags.</p> * {@link Flags#BUILD} flag is in the list of flags.</p>
* *
Expand Down Expand Up @@ -276,7 +275,7 @@ public State queryState(Location location, @Nullable RegionAssociable associable
* *
* <p>{@code player} can be non-null to satisfy region group requirements, * <p>{@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 * 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 * to certain users.) The player argument is required if the
* {@link Flags#BUILD} flag is the flag being queried.</p> * {@link Flags#BUILD} flag is the flag being queried.</p>
* *
Expand Down Expand Up @@ -305,7 +304,7 @@ public <V> V queryValue(Location location, @Nullable LocalPlayer player, Flag<V>
* *
* <p>{@code player} can be non-null to satisfy region group requirements, * <p>{@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 * 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 * to certain users.) The player argument is required if the
* {@link Flags#BUILD} flag is the flag being queried.</p> * {@link Flags#BUILD} flag is the flag being queried.</p>
* *
Expand All @@ -327,7 +326,7 @@ public <V> V queryValue(Location location, @Nullable RegionAssociable associable
* *
* <p>{@code player} can be non-null to satisfy region group requirements, * <p>{@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 * 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 * to certain users.) The player argument is required if the
* {@link Flags#BUILD} flag is the flag being queried.</p> * {@link Flags#BUILD} flag is the flag being queried.</p>
* *
Expand All @@ -348,7 +347,7 @@ public <V> Collection<V> queryAllValues(Location location, @Nullable LocalPlayer
* *
* <p>{@code player} can be non-null to satisfy region group requirements, * <p>{@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 * 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 * to certain users.) The player argument is required if the
* {@link Flags#BUILD} flag is the flag being queried.</p> * {@link Flags#BUILD} flag is the flag being queried.</p>
* *
Expand Down
2 changes: 1 addition & 1 deletion worldguard-core/src/main/java/com/sk89q/worldguard/util/report/RegionReport.java
View file
Expand Up @@ -34,7 +34,7 @@ public RegionReport(ProtectedRegion region) {
append("Priority", region.getPriority()); append("Priority", region.getPriority());
append("Owners", region.getOwners()); append("Owners", region.getOwners());
append("Members", region.getMembers()); append("Members", region.getMembers());
append("FlagUtil", region.getFlags()); append("Flags", region.getFlags());
} }


} }

0 comments on commit 76c3405

Please sign in to comment.