Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't consider global region for blacklisting WG regions

Browse Source
This commit is contained in:
dordsor21 2021-10-25 14:12:21 +01:00
parent 75be38925f
commit 4e6aee6bfb
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/WorldGuardFeature.java
View File

@ -88,13 +88,13 @@ public class WorldGuardFeature extends BukkitMaskManager implements Listener {
LOGGER.info("Region capability is not enabled for that world."); LOGGER.info("Region capability is not enabled for that world.");
return Collections.emptySet(); return Collections.emptySet();
} }
final ProtectedRegion global = manager.getRegion("__global__");
// If they're allowed and it's a whitelist return, else if they're not allowed and it's a blacklist, return
if (global != null && isAllowed(player, global) == isWhitelist) {
return Collections.singleton(global);
}
//Merge WorldGuardFlag //Merge WorldGuardFlag
if (isWhitelist) { if (isWhitelist) {
// Only consider global when whitelisting
final ProtectedRegion global = manager.getRegion("__global__");
if (global != null && isAllowed(player, global)) {
return Collections.singleton(global);
}
final ApplicableRegionSet regions = manager.getApplicableRegions(BlockVector3.at( final ApplicableRegionSet regions = manager.getApplicableRegions(BlockVector3.at(
location.getX(), location.getX(),
location.getY(), location.getY(),
@ -119,6 +119,9 @@ public class WorldGuardFeature extends BukkitMaskManager implements Listener {
final Collection<ProtectedRegion> regions = manager.getRegions().values(); final Collection<ProtectedRegion> regions = manager.getRegions().values();
Set<ProtectedRegion> protectedRegions = new HashSet<>(); Set<ProtectedRegion> protectedRegions = new HashSet<>();
for (ProtectedRegion region : regions) { for (ProtectedRegion region : regions) {
if (region.getId().equals("__global__")) {
continue;
}
if (!isAllowed(player, region)) { if (!isAllowed(player, region)) {
protectedRegions.add(region); protectedRegions.add(region);
} }