Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-09-07 00:22:51 +02:00
fix: fix universal disallowed blocks logic in limit and EditSession compilation (#2237)
- Fixes #2184
Dieser Commit ist enthalten in:
Ursprung
2bdc925b0f
Commit
74aff920a8
@ -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());
|
||||||
}
|
}
|
||||||
|
@ -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()) {
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren