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

Fix: remove unnecessary bypass permission (#2060)

Browse Source 
Fix: remove unnecessary permission
This commit is contained in:
TheJonstone✓ 2023-01-16 00:34:28 +01:00 committed by GitHub
parent ae57ac5d50
commit 0f558425f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/fastasyncworldedit/core/util/WEManager.java
View File

@ -97,7 +97,7 @@ public class WEManager {
* @return array of allowed regions if whitelist, else of disallowed regions. * @return array of allowed regions if whitelist, else of disallowed regions.
*/ */
public Region[] getMask(Player player, FaweMaskManager.MaskType type, final boolean isWhitelist) { public Region[] getMask(Player player, FaweMaskManager.MaskType type, final boolean isWhitelist) {
if (!Settings.settings().REGION_RESTRICTIONS || player.hasPermission("fawe.bypass") || player.hasPermission("fawe.bypass.regions")) { if (!Settings.settings().REGION_RESTRICTIONS || player.hasPermission("fawe.bypass.regions")) {
return new Region[]{RegionWrapper.GLOBAL()}; return new Region[]{RegionWrapper.GLOBAL()};
} }
Location loc = player.getLocation(); Location loc = player.getLocation();

4
worldedit-core/src/main/java/com/sk89q/worldedit/EditSessionBuilder.java
View File

@ -530,7 +530,7 @@ public final class EditSessionBuilder {
} }
} }
if (allowedRegions == null && Settings.settings().REGION_RESTRICTIONS) { if (allowedRegions == null && Settings.settings().REGION_RESTRICTIONS) {
if (actor != null && !actor.hasPermission("fawe.bypass") && !actor.hasPermission("fawe.bypass.regions")) { if (actor != null && !actor.hasPermission("fawe.bypass.regions")) {
if (actor instanceof Player) { if (actor instanceof Player) {
Player player = (Player) actor; Player player = (Player) actor;
allowedRegions = player.getAllowedRegions(); allowedRegions = player.getAllowedRegions();
@ -538,7 +538,7 @@ public final class EditSessionBuilder {
} }
} }
if (disallowedRegions == null && Settings.settings().REGION_RESTRICTIONS && Settings.settings().REGION_RESTRICTIONS_OPTIONS.ALLOW_BLACKLISTS) { if (disallowedRegions == null && Settings.settings().REGION_RESTRICTIONS && Settings.settings().REGION_RESTRICTIONS_OPTIONS.ALLOW_BLACKLISTS) {
if (actor != null && !actor.hasPermission("fawe.bypass") && !actor.hasPermission("fawe.bypass.regions")) { if (actor != null && !actor.hasPermission("fawe.bypass.regions")) {
if (actor instanceof Player) { if (actor instanceof Player) {
Player player = (Player) actor; Player player = (Player) actor;
disallowedRegions = player.getDisallowedRegions(); disallowedRegions = player.getDisallowedRegions();