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

fix: fix universal disallowed blocks logic in limit and EditSession compilation (#2237)

Browse Source 
- Fixes #2184
This commit is contained in:
Jordan 2023-05-22 19:32:36 +01:00 committed by GitHub
parent 2bdc925b0f
commit 74aff920a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/fastasyncworldedit/core/limit/FaweLimit.java
View File

@ -242,7 +242,7 @@ public class FaweLimit {
&& FAST_PLACEMENT && FAST_PLACEMENT
&& !RESTRICT_HISTORY_TO_REGIONS && !RESTRICT_HISTORY_TO_REGIONS
&& (STRIP_NBT == null || STRIP_NBT.isEmpty()) && (STRIP_NBT == null || STRIP_NBT.isEmpty())
&& !UNIVERSAL_DISALLOWED_BLOCKS // && !UNIVERSAL_DISALLOWED_BLOCKS --> do not include this, it effectively has no relevance
&& (DISALLOWED_BLOCKS == null || DISALLOWED_BLOCKS.isEmpty()) && (DISALLOWED_BLOCKS == null || DISALLOWED_BLOCKS.isEmpty())
&& (REMAP_PROPERTIES == null || REMAP_PROPERTIES.isEmpty()); && (REMAP_PROPERTIES == null || REMAP_PROPERTIES.isEmpty());
} }

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

@ -605,7 +605,7 @@ public final class EditSessionBuilder {
} }
if (this.limit != null && !this.limit.isUnlimited()) { if (this.limit != null && !this.limit.isUnlimited()) {
Set<String> limitBlocks = new HashSet<>(); Set<String> limitBlocks = new HashSet<>();
if ((getActor() == null || getActor().hasPermission("worldedit.anyblock")) && this.limit.UNIVERSAL_DISALLOWED_BLOCKS) { if (getActor() != null && !getActor().hasPermission("worldedit.anyblock") && this.limit.UNIVERSAL_DISALLOWED_BLOCKS) {
limitBlocks.addAll(WorldEdit.getInstance().getConfiguration().disallowedBlocks); limitBlocks.addAll(WorldEdit.getInstance().getConfiguration().disallowedBlocks);
} }
if (this.limit.DISALLOWED_BLOCKS != null && !this.limit.DISALLOWED_BLOCKS.isEmpty()) { if (this.limit.DISALLOWED_BLOCKS != null && !this.limit.DISALLOWED_BLOCKS.isEmpty()) {